From a23d1159fa4c3bad5f596acc39852b912c4e13b2 Mon Sep 17 00:00:00 2001 From: Jannik Beyerstedt Date: Thu, 31 Mar 2016 12:59:34 +0200 Subject: [PATCH] [GIT] move kirby to develop --- .gitattributes | 12 ++++++++++++ kirby | 2 +- panel | 2 +- 3 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..6e57158 --- /dev/null +++ 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 diff --git a/kirby b/kirby index 08c25b4..e19eaa0 160000 --- a/kirby +++ b/kirby @@ -1 +1 @@ -Subproject commit 08c25b488f99962819035c14bfc8d5e2031d297d +Subproject commit e19eaa0acf3bedd85f75d6626e14251ddf0cf85b diff --git a/panel b/panel index 606b782..227a18c 160000 --- a/panel +++ b/panel @@ -1 +1 @@ -Subproject commit 606b782e9ccd454cc732668a7f73ab19bbd98d52 +Subproject commit 227a18cf302eba44f9bc8bd6bde79350685c86ab