danielgrippi 648a10e6d3 Merge branch 'master' into follow ... Conflicts: app/controllers/requests_controller.rb app/controllers/tags_controller.rb app/helpers/aspects_helper.rb app/views/notifications/index.html.haml config/routes.rb public/javascripts/aspect-edit.js public/javascripts/contact-list.js spec/integration/receiving_spec.rb spec/models/user/connecting_spec.rb spec/models/user/posting_spec.rb		2011-05-04 11:35:35 -07:00
..
images	high res logo on mobile site	2011-04-01 11:12:41 -07:00
javascripts	Merge branch 'master' into follow	2011-05-04 11:35:35 -07:00
stylesheets	white-space: nowrap; for buttons	2011-05-04 17:53:22 +02:00
well-known	Add public/well-known dir for the moment.	2011-01-10 20:47:20 +01:00
404.html	fix the 404 page to show the dun goofed guy	2011-01-13 17:31:18 -08:00
422.html
500.html	Issue #735: Image link fixed and CSS corrected	2010-12-20 12:09:30 -08:00
apple-touch-icon.png	cleaned up meta and link tags in layout, added retina iOS icon, fixed error caused in stream_element when socketing	2010-11-17 21:21:00 -08:00
default.html	change peoplecontroller order, fix grammar in public default	2011-03-11 10:12:37 -08:00
favicon.ico	make favicon more like apple-touch-icon	2010-12-11 21:00:34 -08:00
robots.txt	update robots.txt to only exclude /people/	2011-05-03 10:32:50 -07:00