Alexander Brakowski 861dc4570f Merge branch 'merge_v1' of https://git.tk.informatik.tu-darmstadt.de/scm-ssi-hostage-v3 into merge_v1 9 лет назад
..
HostageDBContract.java e6bfde4676 added sync data model changes; 9 лет назад
HostageDBOpenHelper.java 861dc4570f Merge branch 'merge_v1' of https://git.tk.informatik.tu-darmstadt.de/scm-ssi-hostage-v3 into merge_v1 9 лет назад
ProfileManager.java cb543bc5ca merged conflicts 9 лет назад