nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
diaspora/app
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
..
controllers Merge branch 'master' into HEAD 2010-09-24 09:15:10 -07:00
helpers Revert "fix in person partial" 2010-09-23 16:21:08 -07:00
models Merge branch 'master' into HEAD 2010-09-24 09:15:10 -07:00
uploaders Spell our own name right 2010-09-15 17:56:18 -07:00
views Revert "fix in person partial" 2010-09-23 16:21:08 -07:00