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
..
_stock_article_form.html.haml	Add percent sign for tax in forms	2013-06-06 17:58:02 +02:00
_stock_change.html.haml	Add article price tooltip to StockTaking form	2013-10-03 22:14:41 +02:00
_stock_takings.html.haml	finish stock_takings i18n + controller	2013-02-13 01:20:20 +01:00
edit.html.haml	fix i18n buglets (closes #167)	2013-09-10 10:27:13 +02:00
index.html.haml	finish stock_takings i18n + controller	2013-02-13 01:20:20 +01:00
index.js.haml	Fixed stockit.	2012-10-29 18:28:17 +01:00
new.html.haml	start of making nickname optional	2013-09-20 22:40:13 +02:00
show.html.haml	finish stock_takings i18n + controller	2013-02-13 01:20:20 +01:00