Massimiliano 2d5f83c7b8 Merge branch 'master' into 'disapp-sr' ... # Conflicts: # app/src/main/res/values-sr/strings.xml		2018-12-23 21:02:33 +01:00
..
drawable	Ready for v1.1.0	2018-12-21 09:19:06 +01:00
drawable-hdpi	Started with Disroot app	2018-09-02 19:00:45 +02:00
drawable-mdpi	Started with Disroot app	2018-09-02 19:00:45 +02:00
drawable-nodpi	Changed logo and fixed some warnings	2018-09-15 11:52:00 +02:00
drawable-xhdpi	Started with Disroot app	2018-09-02 19:00:45 +02:00
drawable-xxhdpi	Started with Disroot app	2018-09-02 19:00:45 +02:00
drawable-xxxhdpi	Started with Disroot app	2018-09-02 19:00:45 +02:00
layout	Ready for v1.1.0	2018-12-21 09:19:06 +01:00
menu	Added cookies + clear cookies	2018-11-06 00:09:41 +01:00
mipmap-hdpi	Started with Disroot app	2018-09-02 19:00:45 +02:00
mipmap-mdpi	Started with Disroot app	2018-09-02 19:00:45 +02:00
mipmap-xhdpi	Started with Disroot app	2018-09-02 19:00:45 +02:00
mipmap-xxhdpi	Started with Disroot app	2018-09-02 19:00:45 +02:00
mipmap-xxxhdpi	Started with Disroot app	2018-09-02 19:00:45 +02:00
values	Added Notes app	2018-12-18 21:00:58 +01:00
values-es	Update spanish translation of strings.xml	2018-12-19 05:05:58 +01:00
values-fr	Added Notes app	2018-12-18 21:00:58 +01:00
values-it	It+Nl translation	2018-12-19 20:15:39 +01:00
values-nl	It+Nl translation	2018-12-19 20:15:39 +01:00
values-pt	Added Notes app	2018-12-18 21:00:58 +01:00
values-sr	Update strings.xml, simplified and updated translation	2018-12-23 20:38:25 +01:00
values-w820dp	added dialogs for additional apps	2018-11-18 13:01:02 +01:00
xml	Ready for v1.1.0	2018-12-21 09:19:06 +01:00