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