Commit Graph

2 Commits (3d2cd94494f0a9b5270ac36822e5fc0d01c5133f)

Author SHA1 Message Date
Skylar Ittner e1837a22fe Merge ../BusinessAppTemplate
# Conflicts:
#	README.md
#	api.php
#	index.php
#	langs/en/core.json
#	langs/en/titles.json
#	mobile/index.php
#	required.php
#	settings.template.php
6 years ago
Skylar Ittner 9a5aefbeb5 Add image uploading for items (close #8) 6 years ago