masensio e2cafad719 Remove old file_details_fragment.xml ... # Conflicts: # res/layout/file_details_fragment.xml		2017-07-27 15:21:34 +02:00
..
layout	Remove old file_details_fragment.xml	2017-07-27 15:21:34 +02:00
xml	Merge branch 'branding' into bring-branding-to-master	2017-03-05 21:09:36 +01:00