Abhinav Adduri 6670d9ad69 fixing conflicts		2017-07-19 12:17:24 -07:00
..
locales	fixing conflicts	2017-07-19 12:17:24 -07:00
resources	minify all images	2017-07-19 13:24:44 -04:00
contribute.json	remove P2P references. Fixes #224	2017-07-19 09:23:42 -07:00
main.css	make footer not overlap	2017-07-19 13:20:06 -04:00
robots.txt	Add robots.txt	2017-06-26 14:42:21 -07:00