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