Sylvain 2c8001f38f Merge branch 'projects' into dev ...

Conflicts:
	app/views/api/members/show.json.jbuilder

2016-07-13 15:57:45 +02:00

..

images

updated echosciences logo

2016-05-16 13:39:16 +02:00

javascripts

Merge branch 'projects' into dev

2016-07-13 15:57:45 +02:00

stylesheets

link to openAPI documentation in front interface

2016-06-27 17:23:05 +02:00

templates

Merge branch 'projects' into dev

2016-07-13 15:57:45 +02:00