Skip to content

Commit

Permalink
Merge branch 'develop' into issue/3791-support-library-23.2
Browse files Browse the repository at this point in the history
# Conflicts:
#	WordPress/build.gradle
#	WordPress/src/main/res/layout/my_site_fragment.xml
#	WordPress/src/main/res/layout/stats_widget_layout.xml
  • Loading branch information
kwonye committed Apr 2, 2016
2 parents 422a249 + 8772a5c commit c969743
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion WordPressUtils/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.0.0-beta7'
classpath 'com.android.tools.build:gradle:2.0.0-rc1'
}
}

Expand Down

0 comments on commit c969743

Please sign in to comment.