1. 02 Oct, 2019 2 commits
  2. 28 May, 2019 1 commit
  3. 29 Apr, 2019 1 commit
  4. 28 Apr, 2019 1 commit
  5. 03 Apr, 2019 1 commit
  6. 08 Mar, 2019 2 commits
  7. 26 Feb, 2019 1 commit
  8. 25 Feb, 2019 1 commit
  9. 01 Feb, 2019 1 commit
  10. 12 Jan, 2019 1 commit
  11. 06 Jan, 2019 1 commit
  12. 05 Jan, 2019 3 commits
  13. 17 Nov, 2018 2 commits
  14. 14 Nov, 2018 1 commit
    • Nihar Thakkar's avatar
      Merge remote-tracking branch 'origin/bitfireAT/master' · 5c18d855
      Nihar Thakkar authored
      # Conflicts:
      #	app/build.gradle
      #	app/src/main/AndroidManifest.xml
      #	app/src/main/java/at/bitfire/davdroid/DavService.kt
      #	app/src/main/java/at/bitfire/davdroid/model/CollectionInfo.kt
      #	app/src/main/java/at/bitfire/davdroid/resource/LocalAddressBook.kt
      #	app/src/main/java/at/bitfire/davdroid/syncadapter/BaseDavSyncManager.kt
      #	app/src/main/java/at/bitfire/davdroid/syncadapter/CalendarSyncManager.kt
      #	app/src/main/java/at/bitfire/davdroid/syncadapter/CalendarsSyncAdapterService.kt
      #	app/src/main/java/at/bitfire/davdroid/syncadapter/ContactsSyncManager.kt
      #	app/src/main/java/at/bitfire/davdroid/syncadapter/SyncManager.kt
      #	app/src/main/java/at/bitfire/davdroid/syncadapter/TasksSyncAdapterService.kt
      #	app/src/main/java/at/bitfire/davdroid/syncadapter/TasksSyncManager.kt
      #	app/src/main/java/at/bitfire/davdroid/ui/AccountActivity.kt
      #	app/src/main/java/at/bitfire/davdroid/ui/DefaultAccountsDrawerHandler.kt
      #	app/src/main/java/at/bitfire/davdroid/ui/setup/AccountDetailsFragment.kt
      #	app/src/main/java/at/bitfire/davdroid/ui/setup/DavResourceFinder.kt
      #	app/src/main/java/at/bitfire/davdroid/ui/setup/LoginActivity.kt
      #	app/src/main/java/at/bitfire/davdroid/ui/setup/LoginInfo.kt
      #	app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
      #	app/src/main/res/values-ca/strings.xml
      #	app/src/main/res/values-cs/strings.xml
      #	app/src/main/res/values-da/strings.xml
      #	app/src/main/res/values-de/strings.xml
      #	app/src/main/res/values-es/strings.xml
      #	app/src/main/res/values-fr/strings.xml
      #	app/src/main/res/values-hu/strings.xml
      #	app/src/main/res/values-it/strings.xml
      #	app/src/main/res/values-ja/strings.xml
      #	app/src/main/res/values-nb-rNO/strings.xml
      #	app/src/main/res/values-nl/strings.xml
      #	app/src/main/res/values-pl/strings.xml
      #	app/src/main/res/values-pt-rBR/strings.xml
      #	app/src/main/res/values-ru/strings.xml
      #	app/src/main/res/values-uk/strings.xml
      #	app/src/main/res/values-zh-rCN/strings.xml
      #	app/src/main/res/values-zh-rTW/strings.xml
      #	app/src/main/res/values/strings.xml
      #	build.gradle
      #	cert4android
      #	dav4android
      #	gradle/wrapper/gradle-wrapper.properties
      #	ical4android
      #	vcard4android
      5c18d855
  15. 04 Nov, 2018 4 commits
  16. 29 Oct, 2018 1 commit
  17. 18 Oct, 2018 1 commit
  18. 07 Oct, 2018 1 commit
  19. 05 Oct, 2018 4 commits
  20. 28 Sep, 2018 1 commit
  21. 22 Sep, 2018 1 commit
  22. 20 Sep, 2018 2 commits
  23. 15 Sep, 2018 1 commit
  24. 08 Sep, 2018 1 commit
  25. 04 Sep, 2018 1 commit
  26. 30 Aug, 2018 3 commits