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

..

_admin_header.html.erb

Adds foundation 6 🎉

2016-02-26 19:33:33 +01:00

_footer.html.erb

Adds title on links with target blank

2016-03-14 19:32:49 +01:00

_header.html.erb

Fixes subnavigation layout

2016-04-19 23:45:03 +02:00

_test.html.erb

Adds foundation 6 🎉

2016-02-26 19:33:33 +01:00

_tracking_data.html.erb

track user verification and add statistics of verified users who did not vote proposals

2016-03-13 21:38:05 +01:00

admin.html.erb

Adds main tag on layouts

2016-03-14 19:32:49 +01:00

application.html.erb

Merge remote-tracking branch 'origin/master' into tracking_user_verifications_and_others

2016-04-20 11:28:06 +02:00

devise.html.erb

Adds main tag on layouts

2016-03-14 19:32:49 +01:00

mailer.html.erb

refactors settings/flags helper to memoize values

2016-02-04 17:45:43 +01:00

management.html.erb

Fixes header for management section

2016-04-04 20:50:15 +02:00