Alexander Brakowski 5bf42a8e9d merge conflicts fixed 9 anni fa
..
activity f80bf8764d fixed merge conflicts 9 anni fa
adapter f80bf8764d fixed merge conflicts 9 anni fa
dialog cb543bc5ca merged conflicts 9 anni fa
fragment 5bf42a8e9d merge conflicts fixed 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