Merge branch 'master' of ../../widgets/src

coneda · Sep 5, 2016 · ffa11a9 · ffa11a9
2 parents 22f0011 + 255bcc8
commit ffa11a9
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,7 +5,6 @@ log/*
 tmp/*
 data/*
 db/*.sqlite3
-node_modules
 public/media
 public/custom.css
 
@@ -53,4 +52,3 @@ screenshot.png
 
 deploy.config.sh
 .vagrant
-
diff --git a/package.json b/package.json
@@ -28,7 +28,7 @@
     "media",
     "repository"
   ],
-  "author": "Moritz Schepp",
+  "author": "Moritz Schepp <moritz.schepp@gmail.com>",
   "license": "AGPL-3.0",
   "bugs": {
     "url": "https://github.com/coneda/kor/issues"

diff --git a/widgets/app.css.scss → widgets/app.scss b/widgets/app.css.scss → widgets/app.scss
diff --git a/widgets/tags/w/style.tag b/widgets/tags/w/style.tag
@@ -1,5 +1,5 @@
 <w-style>
   <style type="text/scss">
-    @import "widgets/app.css.scss";
+    @import "widgets/app.scss";
   </style>
 </w-style>