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