discord-python / site

59%

master: 58%

LAST BUILD ON BRANCH tango

branch: tango

CHANGE BRANCH

x

Reset

• tango
• api_tag_improvements
• build
• constexpr-stuff
• ersa_control_grouping
• feature/eav_entity_store
• feature/issue-100-implement-translation
• fix-coverage-badge
• help-page
• kill-the-snek
• master
• more-unit-tests
• scripts-directory
• unit-testing
• v1.301
• vagrant-memory-reduction

Merge remote-tracking branch 'webu/features/subscribe_to_forums' into tango

Conflicts:
	pybb/forms.py
	pybb/south_migrations/0030_auto__add_forumsubscription__add_unique_forumsubscription_user_forum.py
	pybb/static/pybb/js/pybbjs.js
	pybb/templates/pybb/forum.html
	pybb/tests.py
	pybb/urls.py
	pybb/views.py