Merge branch 'training' into dev

Browse Source

Conflicts:
	app/assets/templates/machines/_form.html.erb
	app/controllers/api/availabilities_controller.rb
	app/models/training.rb
	app/views/api/trainings/index.json.jbuilder
	config/locales/app.shared.en.yml
	config/locales/app.shared.fr.yml
	db/schema.rb

...

This commit is contained in:

Sylvain 2016-07-13 18:23:35 +02:00

parent 90142ae3bb 1e235d3791

commit c9d98e5bf0

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available