Daniel Lazar 2ce4050a54 Merge branch 'master' of https://git.tk.informatik.tu-darmstadt.de/scm-ssi-hostage-v3 пре 9 година
..
activity 49e08e662c Fixed up navigation in the wifi direct activity пре 9 година
adapter 4fd0c4b1b0 fixed services indicator showing wrong icon bug пре 9 година
dialog cb543bc5ca merged conflicts пре 9 година
fragment 2ce4050a54 Merge branch 'master' of https://git.tk.informatik.tu-darmstadt.de/scm-ssi-hostage-v3 пре 9 година
helper cb543bc5ca merged conflicts пре 9 година
layouts cb543bc5ca merged conflicts пре 9 година
model f80bf8764d fixed merge conflicts пре 9 година
popup cb543bc5ca merged conflicts пре 9 година
swipelist cb543bc5ca merged conflicts пре 9 година
task 66b19427a8 Merged rc - branch and small clean up пре 10 година