Commit cbafaab1 authored by Craig Maloney's avatar Craig Maloney
Browse files

Merge branch 'master' of github.com:Deevad/peppercarrot.wiki

parents cb5f5edb a886e67c
......@@ -4,5 +4,6 @@
* [Places](https://github.com/Deevad/peppercarrot/wiki/Places)
* [Magic system](https://github.com/Deevad/peppercarrot/wiki/Magic-System)
* [Time System](https://github.com/Deevad/peppercarrot/wiki/Time-system)
* [Translation Dictionary](https://docs.google.com/spreadsheets/d/1zRqVAj8q1iHwOXQBplXp_DaoZyDgJ3uA0_st_iZEDGg/edit#gid=0)
[official website](http://www.peppercarrot.com)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment