diaspora/public
danielvincent 85cee4064b Merge branch 'master' of github.com:diaspora/diaspora_rails
Conflicts:
	public/javascripts/publisher.js
2010-07-03 22:45:56 -07:00
..
images Renamed jpegs to jpgs 2010-07-01 18:12:00 -07:00
javascripts publisher as a faux nav element. 2010-07-03 22:43:11 -07:00
stylesheets publisher as a faux nav element. 2010-07-03 22:43:11 -07:00
404.html Activerecord this time\! 2010-06-11 10:40:49 -07:00
422.html Activerecord this time\! 2010-06-11 10:40:49 -07:00
500.html Activerecord this time\! 2010-06-11 10:40:49 -07:00
favicon.ico added favicon from pubsite 2010-06-29 22:14:39 -07:00
robots.txt Activerecord this time\! 2010-06-11 10:40:49 -07:00