Merge remote-tracking branch 'origin/stefan-niedermann/master'
# Conflicts: # app/src/main/java/it/niedermann/owncloud/notes/android/activity/NotesListViewActivity.java # app/src/main/res/values-b+en+001/strings.xml # cert4android
Loading
Please register or sign in to comment