Merged in develop (pull request #19)

This commit is contained in:
tom79 2017-06-24 10:54:54 +00:00
commit 39f7be45c1
3 changed files with 3 additions and 3 deletions

View File

@ -7,8 +7,8 @@ android {
applicationId "fr.gouv.etalab.mastodon"
minSdkVersion 15
targetSdkVersion 25
versionCode 21
versionName "1.2.4"
versionCode 22
versionName "1.2.5"
}
buildTypes {
release {

Binary file not shown.

View File

@ -58,7 +58,7 @@ public class WebviewConnectActivity extends AppCompatActivity {
public void onCreate(Bundle savedInstanceState)
{
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_webview);
setContentView(R.layout.activity_webview_connect);
Bundle b = getIntent().getExtras();
if(b != null)
instance = b.getString("instance");