Merge branch 'master' into dev

This commit is contained in:
A. Svensson 2015-05-24 13:38:00 +02:00
commit c5757d79a7

View File

@ -29,6 +29,8 @@ Credits
- [headswe](https://www.reddit.com/user/headswe) - Thanks for [reverse engineered code](http://www.reddit.com/r/SS13/comments/31b5im/a_bunch_of_graphs_for_all_servers/cq11nld) for polling SS13 servers.
- [Hugo14453](https://github.com/Hugo14453) - Thanks for new corgi favicon.
Todo
--------------------------------------------------------------------------------