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
..
app.admin.en.yml	link to openAPI documentation in front interface	2016-06-27 17:23:05 +02:00
app.admin.fr.yml	link to openAPI documentation in front interface	2016-06-27 17:23:05 +02:00
app.logged.en.yml	[feature] paginate public list of members	2016-06-16 16:09:22 +02:00
app.logged.fr.yml	[feature] paginate public list of members	2016-06-16 16:09:22 +02:00
app.public.en.yml	Merge branch 'projects' into dev	2016-07-13 15:57:45 +02:00
app.public.fr.yml	Merge branch 'projects' into dev	2016-07-13 15:57:45 +02:00
app.shared.en.yml	Merge branch 'steps' into dev	2016-07-13 16:10:18 +02:00
app.shared.fr.yml	Merge branch 'steps' into dev	2016-07-13 16:10:18 +02:00
devise.en.yml	release 2.0 rc	2016-03-23 18:39:41 +01:00
devise.fr.yml	release 2.0 rc	2016-03-23 18:39:41 +01:00
en.yml	i18n statistics	2016-06-28 14:07:59 +02:00
fr.yml	i18n statistics	2016-06-28 14:07:59 +02:00
mails.en.yml	mails translations in english	2016-04-11 11:32:32 +02:00
mails.fr.yml	release 2.0 rc	2016-03-23 18:39:41 +01:00
rails.en.yml	release 2.0 rc	2016-03-23 18:39:41 +01:00
rails.fr.yml	release 2.0 rc	2016-03-23 18:39:41 +01:00