Julien Fastré 09099b0566 Merge branch 'master' into 1.0 ...

Conflicts:
	Resources/public/css/scratch.css.map

2016-01-05 14:17:58 +01:00

..

css

Merge branch 'master' into 1.0

2016-01-05 14:17:58 +01:00

fonts

Updating the dependencies

2015-11-25 15:16:12 +01:00

img

Removing useless images

2015-11-25 11:44:53 +01:00

js

select radio button with empty value

2015-12-17 21:46:53 +01:00

sass

Merge branch 'master' into 1.0

2016-01-05 14:17:58 +01:00