chinwag/chinwag-android
chinwag/chinwag-android
2
0
Fork 0
Code Issues Pull requests Releases 5 Activity

Merge branch 'AbsoluteTime' of https://github.com/kyori19/Tusky into kyori19-AbsoluteTime

Browse source 
# Conflicts:
#	app/src/main/java/com/keylesspalace/tusky/adapter/NotificationsAdapter.java
This commit is contained in:
Conny Duck 2018-09-09 21:48:01 +02:00
commit 51d231834c
15 changed files with 153 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/res/values/strings.xml
View file

@ -347,4 +347,6 @@
<string name="profile_metadata_label_label">Label</string>
<string name="profile_metadata_content_label">Content</string>
<string name="pref_title_absolute_time">Use absolute time</string>
</resources>