Sylvain 2c8001f38f Merge branch 'projects' into dev ... Conflicts: app/views/api/members/show.json.jbuilder		2016-07-13 15:57:45 +02:00
..
controllers	Merge branch 'projects' into dev	2016-07-13 15:57:45 +02:00
directives	fix admin user select	2016-06-14 11:30:17 +02:00
filters	fixes in datepicker	2016-03-29 13:31:02 +02:00
services	Merge remote-tracking branch 'origin/open-api' into dev	2016-06-27 16:31:50 +02:00
app.js.erb	add ngSanitize	2016-06-21 13:03:54 +02:00
application.js.erb	remove ngAnimate for fix bug cant click element on Chrome 51	2016-06-20 13:20:54 +02:00
router.coffee.erb	Merge remote-tracking branch 'origin/open-api' into dev	2016-06-27 16:31:50 +02:00