github/diaspora
1
1
Fork 0
mirror of https://github.com/diaspora/diaspora.git synced 2026-04-29 03:01:03 -04:00
Code Issues Packages Projects Releases Wiki Activity
Files
8a30a287afa9bbe81a41ee488c1957f8b8d8ae87
diaspora/config/environments
History
Raphael 70a22ae839 Merge branch 'master' into HEAD 
Conflicts:
	app/models/post.rb
	app/models/user.rb
	config/initializers/socket.rb
2010-09-24 09:15:10 -07:00
..
development.rb
Merge branch 'master' into HEAD
2010-09-24 09:15:10 -07:00
production.rb
Merge branch 'master' of github.com:diaspora/diaspora into production
2010-09-15 22:37:05 -07:00
test.rb
Cleanup stray whitespace
2010-09-16 10:07:59 +08:00