Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into develop

2017-02-16 22:27:10 +01:00 · 2017-02-16 22:27:10 +01:00 · 0be2051588
commit 0be2051588
parent 34bc38f0bf ce5b3d4c92
17 changed files with 74 additions and 18 deletions
--- a/static/bg.jpg
+++ b/static/bg.jpg
--- a/static/bgalt.jpg
+++ b/static/bgalt.jpg
--- a/static/config.json
+++ b/static/config.json
@ -1,4 +1,6 @@
 {
  "name": "Pleroma FE",
-  "theme": "base16-ashes.css"
+  "theme": "base16-ashes.css",
+  "background": "/static/bg.jpg",
+  "logo": "/static/logo.png"
 }
--- a/static/logo.png
+++ b/static/logo.png