Alexander Brakowski 5bf42a8e9d merge conflicts fixed 9 years ago
..
activity f80bf8764d fixed merge conflicts 9 years ago
adapter f80bf8764d fixed merge conflicts 9 years ago
dialog cb543bc5ca merged conflicts 9 years ago
fragment 5bf42a8e9d merge conflicts fixed 9 years ago
helper cb543bc5ca merged conflicts 9 years ago
layouts cb543bc5ca merged conflicts 9 years ago
model f80bf8764d fixed merge conflicts 9 years ago
popup cb543bc5ca merged conflicts 9 years ago
swipelist cb543bc5ca merged conflicts 9 years ago
task 66b19427a8 Merged rc - branch and small clean up 10 years ago