Marin Jankovski af5ea92cc4 Merge branch 'master' into login_page ... Conflicts: CHANGELOG		2014-04-07 20:13:37 +02:00
..
confirmations	Added margin between form and button in resend-confirmation form.	2014-02-14 15:45:41 +01:00
mailer	…
passwords	Added margin between form and button in reset-password form.	2014-02-11 10:39:13 +01:00
registrations	…
sessions	Merge branch 'master' into login_page	2014-04-07 20:13:37 +02:00
shared	…
unlocks	…