Stephen Ficklin ae96ee878b fixed minor issue related to #783 %!s(int64=5) %!d(string=hai) anos
..
css 2ba6c53752 Fixed merge conflicts %!s(int64=6) %!d(string=hai) anos
images f81aec1b59 Merged data collections with the file management %!s(int64=6) %!d(string=hai) anos
js ae96ee878b fixed minor issue related to #783 %!s(int64=5) %!d(string=hai) anos
templates 5a8103068a run phpstorm base style formatter %!s(int64=6) %!d(string=hai) anos