Sylvain 2c8001f38f Merge branch 'projects' into dev ... Conflicts: app/views/api/members/show.json.jbuilder		2016-07-13 15:57:45 +02:00
..
_form.html.erb	fix show existing collaborator name in project edition	2016-06-16 11:11:03 +02:00
edit.html.erb	[feature] 'new project' button in dashboard/my projects	2016-06-01 11:15:01 +02:00
index.html.erb	[feature] display project origin even on origin platform	2016-06-01 11:29:23 +02:00
new.html.erb	[feature] 'new project' button in dashboard/my projects	2016-06-01 11:15:01 +02:00
show.html.erb	fix CAD files title translation in projects	2016-03-30 09:46:20 +02:00