Fix after rebase
authorBartosz Przybylski <bart.p.pl@gmail.com>
Mon, 9 Nov 2015 21:06:53 +0000 (22:06 +0100)
committerBartosz Przybylski <bart.p.pl@gmail.com>
Sun, 15 Nov 2015 19:35:14 +0000 (20:35 +0100)
commit5c138c63277a60f1e3fa091a6b5dba5c317ff438
tree40be961b96aa7110182c310aa3ad1a07aaf43a4d
parentbaf4d79e1ed17f66d0bf472b6476cf732a251693
Fix after rebase
res/xml/preferences.xml
src/com/owncloud/android/ui/activity/Preferences.java