Merge remote-tracking branch 'origin/develop' into feature/issue-61-c…

…akephp-update-v3
foodcoopshop · Feb 2, 2018 · fe0c760 · fe0c760
2 parents cde7240 + 07d96b0
commit fe0c760
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -42,3 +42,4 @@ nbproject/*
 /config/credentials.php
 /config/custom_config.php
 /webroot/node_modules
+/.buildpath