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

..

edit.html.erb

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

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

new.html.erb

Merge branch 'master' into tracking_user_verifications_and_others

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