Merge branch '1.0.x'
Merge branch '1.0.x'
Merge branch '1.0.x'
Pin BuddyPress Docs 1.4.3
Merge branch '1.0.x'
Merge branch '1.0.x'
Fixes unresolved merge conflict
Merge branch '1.0.x'
Update the logo for Retina devices
Merge pull request #99 from CFCommunity-net/master

Update the logo for Retina devices
Add note to readme about branch strategy. See #97
Merge branch '1.0.x'
fix fatal error on front end when bbPress deliberately disabled on subsites
Merge pull request #100 from christianwach/bbpress-main-site

fix fatal error on front end when bbPress disabled on subsites
Pin BuddyPress 2.0.1
BP 2.0 in changelogs
Pin BuddyPress Docs 1.7.0
Pin BuddyPress Docs Wiki add-on 1.0.7
Pin Invite Anyone 1.2.1
Tested up to WP 3.9.1