Merge branch 'develop' of https://github.com/wordpress-mobile/WordPre… · wordpress-mobile/WordPress-Android@b319ace · GitHub

Commit

Merge branch 'develop' of https://github.com/wordpress-mobile/WordPre…

Browse files

…ss-Android into feature/plans-master

Conflicts:
	WordPress/src/main/java/org/wordpress/android/ui/prefs/AppPrefs.java

Loading branch information

nbradbury committed Mar 8, 2016

2 parents 348956c + 521be50 commit b319ace