Merge remote-tracking branch 'origin/master'
Conflicts: version.php
Showing
- classes/log/store.php 14 additions, 0 deletionsclasses/log/store.php
- classes/task/emit_task.php 59 additions, 0 deletionsclasses/task/emit_task.php
- db/install.xml 41 additions, 0 deletionsdb/install.xml
- db/tasks.php 37 additions, 0 deletionsdb/tasks.php
- db/upgrade.php 76 additions, 0 deletionsdb/upgrade.php
- lang/en/logstore_xapi.php 6 additions, 1 deletionlang/en/logstore_xapi.php
- settings.php 9 additions, 4 deletionssettings.php
- version.php 1 addition, 1 deletionversion.php
Loading
Please register or sign in to comment