4 Commits

Author	SHA1	Message	Date
Luke Pulverenti	33b01d778c	merge from dev	2015-12-14 10:43:03 -05:00
Luke Pulverenti	0e1c7cbb7a	rework collection editor	2015-09-15 23:55:26 -04:00
Luke Pulverenti	a2d603a31e	update camera upload	2015-09-10 14:28:22 -04:00
Luke Pulverenti	50dc5c4d1b	add movie resolver fix	2015-09-09 23:22:52 -04:00