Merge branch 'feature' of https://github.com/mybb/mybb into feature
Merge branch 'feature' of https://github.com/mybb/mybb into feature
Fixed #1501.
Merge branch 'feature' of https://github.com/mybb/mybb into fix-1501
Fix #1501.
Fixing co=losing brace indent.
Revert "Fixing co=losing brace indent."

This reverts commit 6d83eaedb206541da20e9d7c0f0edaf5438fbb4b.
Removing .idea.
Merge pull request #1506 from euantorano/fix-1501

Fix #1501