wvengen 34a4951e28 Merge branch 'master' into i18n ... Conflicts: Gemfile config/locales/de.yml config/locales/en.yml		2013-10-09 23:57:43 +02:00
..
images	Fixed admin, orders, wiki views. Converted all erb to haml.	2012-10-15 21:19:17 +02:00
javascripts	Merge branch 'master' into i18n	2013-10-09 23:57:43 +02:00
stylesheets	Add button to clear article search (list.js customization)	2013-09-23 21:31:54 +02:00