Merge pull request LINCnil#135 from LINCnil/develop

Prepare version 1.6.1
3035app · Mar 7, 2018 · 0c07c89 · 0c07c89
2 parents 503f513 + 211a07e
commit 0c07c89
Show file tree

Hide file tree

Showing 67 changed files with 13,192 additions and 668 deletions.
diff --git a/.angular-cli.json b/.angular-cli.json
@@ -35,8 +35,7 @@
         "../node_modules/tinymce/tinymce.js",
         "../node_modules/tinymce/themes/modern/theme.js",
         "../node_modules/tinymce/plugins/lists/plugin.js",
-        "../node_modules/tinymce/plugins/autoresize/plugin.js",
-        "../node_modules/marked/lib/marked.js"
+        "../node_modules/tinymce/plugins/autoresize/plugin.js"
       ],
       "environmentSource": "environments/environment.ts",
       "environments": {

diff --git a/.gitignore b/.gitignore
@@ -42,3 +42,7 @@ yarn-error.log
 # System Files
 .DS_Store
 Thumbs.db
+
+# Docker files
+docker-compose.yml
+Dockerfile