No description
Find a file
danielvincent 762cbcb0f2 Merge branch 'master' of github.com:diaspora/diaspora_rails
Conflicts:
	app/views/comments/_comment.html.haml
	app/views/layouts/application.html.haml
2010-06-28 12:09:35 -07:00
app Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-06-28 12:09:35 -07:00
autotest Activerecord this time\! 2010-06-11 10:40:49 -07:00
config RS IZ testing GUID 2010-06-28 14:28:01 -04:00
db Activerecord this time\! 2010-06-11 10:40:49 -07:00
doc Activerecord this time\! 2010-06-11 10:40:49 -07:00
lib putting debug in for master so I can check deployed servers out 2010-06-26 14:16:19 -07:00
public ui fixup 2010-06-27 16:17:42 -07:00
script Activerecord this time\! 2010-06-11 10:40:49 -07:00
spec fixed a broken common.rb spec 2010-06-25 23:08:59 -07:00
test Activerecord this time\! 2010-06-11 10:40:49 -07:00
vendor/plugins Activerecord this time\! 2010-06-11 10:40:49 -07:00
.gitignore RS, IZ; A bunch of deploy stuff, including nginx, nginx_conf (maybe), and thin conf 2010-06-18 17:33:43 -07:00
.rspec added colors to rake spec, also, use a new shell and the command autotest to constantly keep the testing env going, much much faster 2010-06-13 15:46:40 -07:00
Capfile RS IZ deploy stuffz 2010-06-16 19:42:39 -07:00
config.ru pulled in all of max's changes from yesterday to 187 2010-06-22 10:39:06 -07:00
Gemfile MS mongomapper works kinda 2010-06-24 17:22:49 -07:00
Rakefile Activerecord this time\! 2010-06-11 10:40:49 -07:00
README added colors to rake spec, also, use a new shell and the command autotest to constantly keep the testing env going, much much faster 2010-06-13 15:46:40 -07:00

broner