Christoph Mewes avatar Christoph Mewes committed 05261e8 Merge

merge with 1.2

Comments (0)

Files changed (1)

     "license": "MIT",
     "type": "sallycms-addon",
     "require": {
-        "sallycms/composer-installer": "*",
+        "sallycms/composer-installer": "~1.1",
         "sallycms/sallycms": ">=0.6,<0.8",
-        "webvariants/zend-framework-gdata": "*",
-        "webvariants/global-settings": "*"
+        "webvariants/zend-framework-gdata": "~1.2",
+        "webvariants/global-settings": "~5.8"
     },
     "autoload": {
         "psr-0": {
     "extra": {
         "sallycms": {
             "parent": "webvariants/zend-framework",
-            "version": "1.2-dev"
+            "version": "1.2.x-dev"
         },
         "branch-alias": {
-            "dev-default": "1.2.x-dev"
+            "dev-default": "1.x-dev"
         }
     }
 }
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.