Merge branch 'master' into allow-no-nickname

Conflicts: app/views/foodcoop/users/_users.html.haml
2013-10-29 19:15:52 +01:00 · 2013-10-29 19:15:52 +01:00 · c37ed74942
commit c37ed74942
parent e13ca74df3 ed0ac706b9
84 changed files with 1712 additions and 2579 deletions
--- a/app/views/shared/_open_orders.html.haml
+++ b/app/views/shared/_open_orders.html.haml
@ -2,7 +2,7 @@
  %h2= t '.title'
  - if ordergroup.not_enough_apples?
    .alert
-    = t '.not_enough_apples'
+      = t '.not_enough_apples'
  - unless Order.open.empty?
    %table.table.table-striped
      %thead