Merge remote-tracking branch 'refs/remotes/origin/2.8-release'

# Conflicts:
#	app/build.gradle
This commit is contained in:
misaochan 2018-07-05 01:00:51 +10:00
commit 107729cdf0
4 changed files with 18 additions and 2 deletions

View file

@ -289,4 +289,6 @@
<string name="wikidata_edit_failure">Failed to update corresponding Wikidata entity!</string>
<string name="menu_set_wallpaper">Set wallpaper</string>
<string name="wallpaper_set_successfully">Wallpaper set successfully!</string>
<string name="user_not_logged_in">Login session expired, please log in again.</string>
</resources>