1
0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2024-12-01 12:24:28 +01:00
fab-manager/app/assets
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
..
images updated echosciences logo 2016-05-16 13:39:16 +02:00
javascripts Merge branch 'events' into dev 2016-07-13 18:32:30 +02:00
stylesheets fix articles image height 2016-07-04 10:53:09 +02:00
templates Merge branch 'events' into dev 2016-07-13 18:32:30 +02:00