oss/wallabag
oss/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-08-01 17:38:38 +00:00
Code Wiki Activity

Merge remote-tracking branch 'origin/master' into 2.4

Browse source 
# Conflicts:
#	web/wallassets/baggy.js
#	web/wallassets/manifest.json
#	web/wallassets/material.css
#	web/wallassets/material.js
This commit is contained in:
Jeremy Benoist 2018-11-25 09:58:18 +01:00
commit b878be4cc9
No known key found for this signature in database
GPG key ID: BCA73962457ACC3C
40 changed files with 802 additions and 136 deletions
Download patch file Download diff file Expand all files Collapse all files

2
web/wallassets/material.css
View file

File diff suppressed because one or more lines are too long

BIN
web/wallassets/themes/_global/img/appicon/apple-touch-icon-512.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 27 KiB