8 Commits

Author	SHA1	Message	Date
Luke Pulverenti	4492dcc592	update merge	2015-09-20 13:34:05 -04:00
Luke Pulverenti	25c37e40ad	update merge	2015-09-20 13:28:32 -04:00
Luke Pulverenti	baf2f80154	update camera upload	2015-09-10 14:28:22 -04:00
Luke Pulverenti	25736b259a	normalize tv recording objects	2015-05-31 14:22:51 -04:00
Luke Pulverenti	2b179ecfe2	update image magick sharp	2015-03-04 12:22:55 -05:00
Luke Pulverenti	8a9f16ff6a	enable user device access	2014-12-29 15:18:48 -05:00
Luke Pulverenti	726cf9697a	sync updates	2014-12-28 12:59:40 -05:00
Luke Pulverenti	0ec3d217e7	sync updates	2014-12-26 12:45:06 -05:00