nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
diaspora/public
History
Daniel Vincent Grippi 200b0045f7 Merge branch 'master' of github.com:diaspora/diaspora 
Conflicts:
	public/stylesheets/application.css
	public/stylesheets/sass/application.sass
2010-09-13 11:22:05 -07:00
..
images more cleanup 2010-09-13 11:05:10 -07:00
javascripts Rename files from group to aspect 2010-09-13 10:43:15 -07:00
stylesheets Merge branch 'master' of github.com:diaspora/diaspora 2010-09-13 11:22:05 -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