added gitignore file, added contao4 compat

hofff · Jun 21, 2017 · ec17ebd · ec17ebd
1 parent 85fb22d
commit ec17ebd
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,16 @@
+# OS
+.DS_Store
+Thumbs.db
+
+# IDEs
+.buildpath
+.project
+.settings/
+.build/
+.idea/
+nbproject/
+
+# Composer
+/vendor/
+composer.phar
+composer.lock
diff --git a/composer.json b/composer.json
@@ -17,8 +17,8 @@
   ],
   "require": {
     "php": ">=5.6",
-    "contao/core": ">=3.5,<3.6-dev",
-    "contao-community-alliance/composer-plugin": "~2"
+    "contao/core-bundle": "^3.5 || ^4.1",
+    "contao-community-alliance/composer-plugin": "^2.4 || ^3.0"
   },
   "autoload": {
     "psr-0": {