palomahnhp bf5d253e12 Merge branch 'master' into tracking_user_verifications_and_others ...

Conflicts:
	app/controllers/admin/stats_controller.rb
	db/dev_seeds.rb

2016-04-20 11:44:33 +02:00

..

fonts

Use of fontastic instead of font-awesome

2016-03-12 22:20:35 +01:00

images

Replaces districts map to generic image

2016-01-26 13:28:34 +01:00

javascripts

Merge branch 'master' into tracking_user_verifications_and_others

2016-04-20 11:44:33 +02:00

stylesheets

Improves styles for long proposals show texts

2016-04-19 00:08:50 +02:00