Sylvain 68f9324725 Merge branch 'steps' into dev ...

Conflicts:
	app/assets/javascripts/controllers/projects.coffee.erb
	db/schema.rb

2016-07-13 16:10:18 +02:00

..

controllers

Merge branch 'steps' into dev

2016-07-13 16:10:18 +02:00

directives

fix admin user select

2016-06-14 11:30:17 +02:00

filters

fix short descriptions in machines index

2016-06-01 13:53:55 +02:00

services

Merge remote-tracking branch 'origin/open-api' into dev

2016-06-27 16:31:50 +02:00

app.js.erb

Merge branch 'steps' into dev

2016-07-13 16:10:18 +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