Merge pull request #1 from Raggaer/master

merge
Raggaer · Mar 21, 2019 · d660162 · d660162
2 parents 9aff99b + f6cb036
commit d660162
Show file tree

Hide file tree

Showing 42 changed files with 1,064 additions and 656 deletions.
diff --git a/.gitignore b/.gitignore
@@ -22,4 +22,7 @@ public/images/outfits/*.png
 public/ckeditor/images/*.png
 !public/ckeditor/images/.gitkeep
 i18n/*.i18n
-tls
+tls
+*.swp
+*~
+castro
diff --git a/Gopkg.lock b/Gopkg.lock