Mikel Maron be40536440 merge upstream/master and resolve conflicts from https://github.com/openstreetmap/openstreetmap-website/pull/1318		2016-10-12 10:52:05 -04:00
..
assets	css in right place; fix structure.sql	2016-10-06 21:47:29 -04:00
controllers	merge upstream/master and resolve conflicts from https://github.com/openstreetmap/openstreetmap-website/pull/1318	2016-10-12 10:52:05 -04:00
helpers	Fix some rubocop warnings	2016-09-15 22:41:07 +01:00
models	fix rubocop warnings	2016-10-07 06:32:05 -04:00
views	last minor fixes	2016-10-11 20:42:10 -04:00