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
..
events.html.erb	rename Courses/Workshops to Events	2016-06-28 11:42:20 +02:00
invoices.html.erb	release 2.0 rc	2016-03-23 18:39:41 +01:00
nav.html.erb	rename Courses/Workshops to Events	2016-06-28 11:42:20 +02:00
profile.html.erb	migrate profile edit to 'my parameters' tab and add public profile in dashboard	2016-05-12 13:53:59 +02:00
projects.html.erb	[feature] 'new project' button in dashboard/my projects	2016-06-01 11:15:01 +02:00
settings.html.erb	migrate profile edit to 'my parameters' tab and add public profile in dashboard	2016-05-12 13:53:59 +02:00
trainings.html.erb	release 2.0 rc	2016-03-23 18:39:41 +01:00