Commit 1b83ac54 authored by Zachary Doll's avatar Zachary Doll

Resolve merge conflicts

parents ee7c7aed 0a10a8ae
......@@ -11,6 +11,10 @@ Yaga requires:
* Vanilla 2.2.x (Garden is the actual requirement)
* Pretty URLs enabled
## Contributing
Please contribute fixes against the `develop` branch.
## Documentation
Yaga's [main documentation page is here](http://hgtonight.github.io/Application-Yaga/).
......
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