Merge branch 'wip'

# Conflicts: # app/helpers/site_helper.php
munkireport · Oct 13, 2016 · 06745ac · 06745ac
2 parents 9499a32 + e447e2d
commit 06745ac
Show file tree

Hide file tree

Showing 189 changed files with 12,556 additions and 11,216 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,3 +8,7 @@ config.php
 *.DS_Store
 
 *.zip
+
+vendor/*
+
+composer.lock