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