merging conflicts

--HG--
branch : Gsoc14-ryzomAppImprovements
This commit is contained in:
shubham_meena 2014-07-07 01:57:08 +05:30
commit edfe73b1ec
2 changed files with 1 additions and 1 deletions

View file

@ -1,4 +1,4 @@
<?php <?php
/** /**
* API for loading and interacting with plugins * API for loading and interacting with plugins