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
..
_users.html.haml	Merge branch 'master' into allow-no-nickname	2013-10-29 19:15:52 +01:00
index.html.haml	finish foodcoop i18n + controller + model	2013-02-22 00:19:22 +01:00
index.js.haml	Fixed admin, orders, wiki views. Converted all erb to haml.	2012-10-15 21:19:17 +02:00