[GIT] move kirby to develop

2016-03-31 12:59:34 +02:00 · 2016-03-31 12:59:34 +02:00 · a23d1159fa
parent 8aec99194d
commit a23d1159fa
3 changed files with 14 additions and 2 deletions
--- a/.gitattributes
+++ b/.gitattributes
@ -0,0 +1,12 @@
+# Enforce Unix newlines
+*.css   text eol=lf
+*.html  text eol=lf
+*.js    text eol=lf
+*.json  text eol=lf
+*.md    text eol=lf
+*.scss  text eol=lf
+*.svg   text eol=lf
+*.yml   text eol=lf
+*.yaml  text eol=lf
+# Don't diff or textually merge source maps
+*.map   binary
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 08c25b488f99962819035c14bfc8d5e2031d297d
+Subproject commit e19eaa0acf3bedd85f75d6626e14251ddf0cf85b
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 606b782e9ccd454cc732668a7f73ab19bbd98d52
+Subproject commit 227a18cf302eba44f9bc8bd6bde79350685c86ab