Sylvain 4d4248bcca Merge branch 'dev' into events ...

Conflicts:
	db/seeds.rb

2016-06-28 14:18:15 +02:00

..

app.admin.en.yml

rename Courses/Workshops to Events

2016-06-28 11:42:20 +02:00

app.admin.fr.yml

rename Courses/Workshops to Events

2016-06-28 11:42:20 +02:00

app.logged.en.yml

rename Courses/Workshops to Events

2016-06-28 11:42:20 +02:00

app.logged.fr.yml

rename Courses/Workshops to Events

2016-06-28 11:42:20 +02:00

app.public.en.yml

rename Courses/Workshops to Events

2016-06-28 11:42:20 +02:00

app.public.fr.yml

rename Courses/Workshops to Events

2016-06-28 11:42:20 +02:00

app.shared.en.yml

rename Courses/Workshops to Events

2016-06-28 11:42:20 +02:00

app.shared.fr.yml

rename Courses/Workshops to Events

2016-06-28 11:42:20 +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

Merge branch 'dev' into events

2016-06-28 14:18:15 +02:00

fr.yml

Merge branch 'dev' into events

2016-06-28 14:18:15 +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