mirror of
https://port.numenaute.org/aleajactaest/khanat-opennel-code.git
synced 2024-11-18 05:11:42 +00:00
merging conflicts
--HG-- branch : Gsoc14-ryzomAppImprovements
This commit is contained in:
commit
edfe73b1ec
2 changed files with 1 additions and 1 deletions
Binary file not shown.
|
@ -1,4 +1,4 @@
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* API for loading and interacting with plugins
|
* API for loading and interacting with plugins
|
||||||
|
|
Loading…
Reference in a new issue