Conny Duck 51d231834c Merge branch 'AbsoluteTime' of https://github.com/kyori19/Tusky into kyori19-AbsoluteTime ... # Conflicts: # app/src/main/java/com/keylesspalace/tusky/adapter/NotificationsAdapter.java		2018-09-09 21:48:01 +02:00
..
attrs.xml
colors.xml	Make page margin to truly black for tablets. (#834)	2018-09-04 18:35:17 +02:00
dimens.xml	Improve media resizing (#722)	2018-07-23 21:55:09 +02:00
donottranslate.xml	Add black theme (#726)	2018-07-30 15:31:35 +02:00
integers.xml
strings.xml	Merge branch 'AbsoluteTime' of https://github.com/kyori19/Tusky into kyori19-AbsoluteTime	2018-09-09 21:48:01 +02:00
styles.xml	Make page margin to truly black for tablets. (#834)	2018-09-04 18:35:17 +02:00
toot_button.xml