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
..
_ordergroup.haml	i18n financial_transactions + controller	2013-02-11 10:21:39 +07:00
_transactions.html.haml	start of making nickname optional	2013-09-20 22:40:13 +02:00
index.html.haml	i18n financial_transactions + controller	2013-02-11 10:21:39 +07:00
index.js.haml	Fixed admin, orders, wiki views. Converted all erb to haml.	2012-10-15 21:19:17 +02:00
new.html.haml	move commonly used verbs to common i18n identifier	2013-04-04 02:49:52 +02:00
new_collection.html.haml	proper usage of jQuery.on(), and update javascript in views as well	2013-07-08 22:41:06 +02:00