Commit Graph

2 Commits (5c0bea68a9cdc79abbf9ca11450f7793fb1ebc7e)

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