[go: nahoru, domu]
Skip to content

Commit

Permalink
Merge branch 'develop' of https://github.com/wordpress-mobile/WordPre…
Browse files Browse the repository at this point in the history 
…ss-Android into feature/plans-master

Conflicts:
	WordPress/src/main/java/org/wordpress/android/ui/prefs/AppPrefs.java
  • Loading branch information
@nbradbury
nbradbury committed Mar 8, 2016
2 parents 259c0cc + c34f307 commit cf7abc9
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit cf7abc9

Please sign in to comment.