Sebastian 4bea02cb16 resolved merge conflicts

2017-11-19 18:31:14 +01:00

..

author

Version 1.0.0

2017-04-14 21:45:15 +02:00

Controllers

resolved merge conflicts

2017-11-19 18:31:14 +01:00

Events

event system and plugins

2017-11-17 17:44:02 +01:00

Models

event system and plugins

2017-11-17 17:44:02 +01:00

Routes

event system and plugins

2017-11-17 17:44:02 +01:00

vendor

version 1.0.4 changed settings and fixed bug

2017-11-19 17:44:42 +01:00

autoload.php

Version 1.0.0

2017-04-14 21:45:15 +02:00

Plugin.php

event system and plugins

2017-11-17 17:44:02 +01:00

Plugins.php

event system and plugins

2017-11-17 17:44:02 +01:00

settings.php

version 1.0.4 changed settings and fixed bug

2017-11-19 17:44:42 +01:00

system.php

resolved merge conflicts

2017-11-19 18:31:14 +01:00