1
0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2025-02-19 13:54:25 +01:00
Sylvain 6839e8db38 Merge branch 'events' into dev
Conflicts:
	CHANGELOG.md
	config/locales/app.shared.en.yml
	config/locales/app.shared.fr.yml
2016-07-13 18:32:30 +02:00
..
2016-07-13 18:32:30 +02:00
2016-07-13 16:15:50 +02:00
2016-07-13 18:32:30 +02:00