Zhu Jinhui 0a31b33423 Merge dev to master 7 gadi atpakaļ
..
configure 0a31b33423 Merge dev to master 7 gadi atpakaļ
controller 0a31b33423 Merge dev to master 7 gadi atpakaļ
plugins 0a31b33423 Merge dev to master 7 gadi atpakaļ
view 0a31b33423 Merge dev to master 7 gadi atpakaļ
Bootstrap.php 0a31b33423 Merge dev to master 7 gadi atpakaļ