7 Commits

Author	SHA1	Message	Date
Ubuntu	9b4d874b62	fixed upload.php merge conflict	2019-04-20 16:51:49 -04:00
Ubuntu	dfaf9a1fe9	Merge branch 'master' into Tristan_submit.php	2019-04-20 16:45:14 -04:00
Ubuntu	a3b3a5b590	Upload.php html done	2019-04-20 16:40:36 -04:00
Ubuntu	2168199135	upload.php 1st draft	2019-04-20 16:27:51 -04:00
Ubuntu	02c5c43428	work on the upload page	2019-04-20 15:17:00 -04:00
Ubuntu	4eeda2e474	upload.php html and temporary style	2019-04-20 03:19:40 -04:00
Ubuntu	6577bc3bd3	html for upload.php	2019-04-20 00:44:46 -04:00