Zhu Jinhui 0a31b33423 Merge dev to master 7 rokov pred
..
smarty 0a31b33423 Merge dev to master 7 rokov pred
Dependence.php 0a31b33423 Merge dev to master 7 rokov pred
Includes.php 0a31b33423 Merge dev to master 7 rokov pred
Intf.php 0a31b33423 Merge dev to master 7 rokov pred
Loader.php 0a31b33423 Merge dev to master 7 rokov pred
Render.php 0a31b33423 Merge dev to master 7 rokov pred
Requires.php 0a31b33423 Merge dev to master 7 rokov pred
Resource.php 0a31b33423 Merge dev to master 7 rokov pred
Smarty.php 0a31b33423 Merge dev to master 7 rokov pred