palomahnhp b4ec077f16 Merge remote-tracking branch 'origin/master' into tracking_user_verifications_and_others ...

Conflicts:
	app/assets/javascripts/application.js

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

..

_errors.html.erb

Adds title on links with target blank

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

new.html.erb

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

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