Skip to content

Commit

Permalink
Merge pull request #324 from jogrimst/master
Browse files Browse the repository at this point in the history
Release 1.3.5
  • Loading branch information
literacyapp authored Jan 5, 2017
2 parents 57c282d + d5bca6f commit 76ba31b
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
3 changes: 2 additions & 1 deletion app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ android {
minSdkVersion 21
targetSdkVersion 23
versionCode 1003005
versionName "1.3.5-SNAPSHOT"
versionName "1.3.5"
setProperty("archivesBaseName", "$applicationId-$versionName")

// jackOptions {
// enabled true
Expand Down
8 changes: 4 additions & 4 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -118,11 +118,11 @@
<activity
android:name=".authentication.fallback.StudentAuthenticationActivity"
android:icon="@mipmap/ic_launcher_authentication">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<!--<intent-filter>-->
<!--<action android:name="android.intent.action.MAIN" />-->

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
<!--<category android:name="android.intent.category.LAUNCHER" />-->
<!--</intent-filter>-->
</activity>
<activity
android:name=".authentication.fallback.StudentSelectionActivity"
Expand Down

0 comments on commit 76ba31b

Please sign in to comment.