Merge branch 'dev' into patch1_ui

This commit is contained in:
Vasiliy 2019-02-23 13:14:47 +02:00
commit 5318e77035
No known key found for this signature in database
GPG key ID: 9F74C4D2874D7523
41 changed files with 1862 additions and 583 deletions

View file

@ -5,6 +5,6 @@
<item android:id="@+id/action_history_clear"
android:orderInCategory="940"
android:title="@string/clear_history"
android:title="@string/clear_views_history_title"
app:showAsAction="never"/>
</menu>