From 3d111c0af89167a1f9a19d1397a9d48b368ba176 Mon Sep 17 00:00:00 2001
From: Vadim Sikora <vadim.sikora@divio.ch>
Date: Mon, 3 Apr 2017 14:01:44 +0200
Subject: [PATCH] Inherit gitignore from Divio Cloud

---
 .gitignore       | 26 +++++++++++++++++++++++---
 CHANGELOG.rst    |  6 ++++++
 boilerplate.json |  2 +-
 3 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 37e3a6a..0283509 100755
--- a/.gitignore
+++ b/.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
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 85460f1..bd439b3 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,6 +2,12 @@
 Aldryn Boilerplate Bootstrap 3
 ##############################
 
+4.2.1
+=====
+
+- Added inherited .gitignore entries from Divio Cloud
+
+
 4.2.0
 =====
 
diff --git a/boilerplate.json b/boilerplate.json
index dc6e6d9..b86e619 100644
--- a/boilerplate.json
+++ b/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"]
     ],