Branches

As of Round 52, this fork will be split into a number of branches with different target audiences.

##Main Branches ###master The main, original branch. This is a heavily modified version, but essentially behaves like ellonweb's.

###acl My most significant change. This branch uses commands like !addgroup and !grant to control access, in place of manually editing merlin.cfg or individual files in the Hooks directory.

##Stable Branches These branch will receive some updates, but will not alter the database structure during the round. Because of this, adding features from here during the round shouldn't cause any problems.

legacy-stable is based on master, acl-stable is based on acl.

##Tags A tag of each stable branch will be attached at the start of each round. If you check out this tag, it will always be the same. e.g. r52-legacy, r52-acl

##Comments At some point, once I am satisfied with the acl branch, it will become master and master will be renamed to legacy. Eventually, I may stop upgrading the legacy branch.