diff options
author | Cédric Bonhomme <cedric@cedricbonhomme.org> | 2016-04-21 22:03:21 +0200 |
---|---|---|
committer | Cédric Bonhomme <cedric@cedricbonhomme.org> | 2016-04-21 22:03:21 +0200 |
commit | 3700ba780933c8323950b609c2750c944eb958c9 (patch) | |
tree | 7a4e0e2c52ded453f188370ab0754b2852e9d01e /src/web/views/icon.py | |
parent | Fix conflicts. (diff) | |
parent | Fixed encoding problems in the translations. (diff) | |
download | newspipe-3700ba780933c8323950b609c2750c944eb958c9.tar.gz newspipe-3700ba780933c8323950b609c2750c944eb958c9.tar.bz2 newspipe-3700ba780933c8323950b609c2750c944eb958c9.zip |
Merge branch 'master' into new-api
Diffstat (limited to 'src/web/views/icon.py')
0 files changed, 0 insertions, 0 deletions