Stephen Ficklin ae96ee878b fixed minor issue related to #783 5 lat temu
..
css 2ba6c53752 Fixed merge conflicts 6 lat temu
images f81aec1b59 Merged data collections with the file management 6 lat temu
js ae96ee878b fixed minor issue related to #783 5 lat temu
templates 5a8103068a run phpstorm base style formatter 6 lat temu