Zhu Jinhui 73f2df5555 Merge dev to master 7 rokov pred
..
actions d123dcd681 Update file 7 rokov pred
configure fd365ee3f6 Fixed Router error 7 rokov pred
controller 73f2df5555 Merge dev to master 7 rokov pred
helper 73f2df5555 Merge dev to master 7 rokov pred
i18n d123dcd681 Update file 7 rokov pred
model d123dcd681 Update file 7 rokov pred
plugins 0a31b33423 Merge dev to master 7 rokov pred
view 73f2df5555 Merge dev to master 7 rokov pred
Bootstrap.php 0a31b33423 Merge dev to master 7 rokov pred