wvengen c37ed74942 Merge branch 'master' into allow-no-nickname ... Conflicts: app/views/foodcoop/users/_users.html.haml		2013-10-29 19:15:52 +01:00
..
_header.html.haml	use i18n-js	2013-10-04 15:01:10 +02:00
application.html.haml	start of making nickname optional	2013-09-20 22:40:13 +02:00
application1.html.haml	finish layouts i18n, use help url from config, use html language from locale	2013-02-05 12:11:29 +01:00
email.text.haml	finish layouts i18n, use help url from config, use html language from locale	2013-02-05 12:11:29 +01:00
login.html.haml	finish layouts i18n, use help url from config, use html language from locale	2013-02-05 12:11:29 +01:00