Merge branch 'master' into master

This commit is contained in:
Hassan 2018-02-17 12:07:58 -06:00 committed by GitHub
commit b03e67dcd6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
66 changed files with 535 additions and 325 deletions

View file

@ -34,7 +34,7 @@ public class AboutActivity extends NavigationBaseActivity {
setContentView(R.layout.activity_about);
ButterKnife.bind(this);
String aboutText = getString(R.string.about_license, getString(R.string.trademarked_name));
String aboutText = getString(R.string.about_license);
aboutLicenseText.setHtmlText(aboutText);
versionText.setText(BuildConfig.VERSION_NAME);