Merge branch 'develop'

* develop: Preparing 1.6.0 release translation correction german translation improvements # Conflicts: # Resources/lang/de/blocks.php
AsgardCms · Oct 27, 2015 · f769482 · f769482
2 parents adfaa09 + 1effda3
commit f769482
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/changelog.yml b/changelog.yml
@@ -1,5 +1,8 @@
 url: https://github.com/AsgardCms/Block
 versions:
+    "1.6.0":
+        changed:
+            - Improving german translations
     "1.5.0":
         added:
             - Added de locale pt and pt-BR

diff --git a/module.json b/module.json
@@ -9,7 +9,7 @@
   ],
   "active": 1,
   "order": 1,
-  "version": "1.5.0",
+  "version": "1.6.0",
   "providers": [
     "Modules\\Block\\Providers\\BlockServiceProvider",
     "Modules\\Block\\Providers\\RouteServiceProvider"