Merge branch 'release' into develop

2025-12-17 14:47:53 +01:00 · 2017-08-03 21:46:41 +00:00
parent 75913842bc 9b2b9ef54d
commit ac800a94f9
230 changed files with 34809 additions and 34141 deletions
--- a/website/server/controllers/api-v3/shops.js
+++ b/website/server/controllers/api-v3/shops.js
@@ -107,8 +107,8 @@ api.getSeasonalShopItems = {
    let resObject = {
      identifier: 'seasonalShop',
      text: res.t('seasonalShop'),
-      notes: res.t('seasonalShopSummerText'),
-      imageName: 'seasonalshop_open',
+      notes: res.t('seasonalShopClosedText'),
+      imageName: 'seasonalshop_closed',
      categories: shops.getSeasonalShopCategories(user, req.language),
    };