Merge branch 'release/2.0.1'
prevent upgrade from running spuriously
Merge branch 'release/2.5b1'
Merge branch 'release/2.5b1'
Merge branch 'master' of github.com:crowdfavorite/wp-social
Merge branch 'release/2.5b2'
Merge branch 'release/2.5'
Merge branch 'release/2.6rc1'
Merge branch 'release/2.6rc2'
bump version in plugin file
resolved conflict
update version
Merge branch 'release/2.6.1'
resolving conflicts
Missing text domain
Missing text domain
Merge branch 'release/2.8'
add license.txt
make readme caps
Merge branch 'develop'