BitsDevelopmentTeam / bits-server

Presence and logging daemon for BITS system.
GNU General Public License v3.0
5 stars 2 forks source link

Fixed Minutes + SockJS #20

Closed thypon closed 10 years ago

esseks commented 10 years ago

Please rebase your changes on current development head (i.e. fetch/pull), otherwise this changeset generates a conflict. and tries to replay modification that were already merged into development (what was in your pull request #17 plus my latest commit). Apart from that, it looks good.

If you haven't done it already, please take some time to read the updated README.md for git workflow :)