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