nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
diaspora/app
History
Raphael 33048fe6db Merge branch 'master' of github.com:diaspora/diaspora into production 
Conflicts:
	app/models/user.rb
	spec/models/aspect_spec.rb
2010-09-15 17:24:00 -07:00
..
controllers Merge branch 'master' of github.com:diaspora/diaspora into production 2010-09-15 17:24:00 -07:00
helpers License notices replaced 2010-09-15 10:58:48 -07:00
models Merge branch 'master' of github.com:diaspora/diaspora into production 2010-09-15 17:24:00 -07:00
uploaders License notices replaced 2010-09-15 10:58:48 -07:00
views Merge branch 'master' of github.com:diaspora/diaspora 2010-09-15 17:05:36 -07:00