Oops. Why did I change this.
Merge branch 'edit' into deploy
Oops. Why did I change this.
Merge branch 'edit' into deploy

Conflicts:
	brave/forums/component/comment/controller.py