Inherit gitignore from Divio Cloud

.gitignore

@@ -1,10 +1,31 @@
+# <DEFAULT>  # Warning: text inside the DEFAULT tags is auto-generated on Divio Cloud. Manual changes will be overwritten.
+# OS generated
+.DS_Store
+.DS_Store?
+._*
+.Spotlight-V100
+.Trashes
+ehthumbs.db
+Thumbs.db
+*~
+
+# Python
 *.pyc
 *.pyo
-*~
+
+# Aldryn
+/.env
+/.env-local
+.aldryn
+/data
+/data.tar.gz
+/static_collected
+/node_modules
+# </DEFAULT>
+
 .hg
 .git
 .svn
-.DS_Store
 .settings
 .project
 .pydevproject
@@ -21,7 +42,6 @@
 /src/settings_local*.py
 /requirements_local*.txt
 
-/node_modules
 /bower_components
 npm-debug.log
 *.css.map

CHANGELOG.rst

@@ -2,6 +2,12 @@
 Aldryn Boilerplate Bootstrap 3
 ##############################
 
+4.2.1
+=====
+
+- Added inherited .gitignore entries from Divio Cloud
+
+
 4.2.0
 =====
 

boilerplate.json

@@ -1,7 +1,7 @@
 {
     "identifier": "bootstrap3",
     "package-name": "aldryn-boilerplate-bootstrap3-libsass",
-    "version": "4.2.0",
+    "version": "4.2.1",
     "templates": [
         ["base.html", "base"]
     ],