Merge upstream (#111)

2017-08-01 13:07:43 -07:00
parent b61e3daf98 7ef8482568
commit 8150689b48
205 changed files with 1927 additions and 1507 deletions
--- a/public/sw.js
+++ b/public/sw.js
@@ -0,0 +1 @@
+assets/sw.js
--- a/public/web-push-icon_expand.png
+++ b/public/web-push-icon_expand.png
--- a/public/web-push-icon_favourite.png
+++ b/public/web-push-icon_favourite.png
--- a/public/web-push-icon_reblog.png
+++ b/public/web-push-icon_reblog.png