nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
diaspora/app
History
maxwell 5e6d0c1153 Merge branch 'master' of github.com:diaspora/diaspora_rails into 
friend-refactor, also fixed more specs

Conflicts:
	app/models/person.rb
	app/models/user.rb
	spec/factories.rb
2010-08-05 15:13:05 -07:00
..
controllers Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-08-04 16:01:37 -07:00
helpers RS, IZ; extracted and murdered ostatus. 2010-08-04 16:00:01 -07:00
models Merge branch 'master' of github.com:diaspora/diaspora_rails into 2010-08-05 15:13:05 -07:00
uploaders Fixed Photos, and Carrierwave initializer 2010-08-02 21:31:14 -07:00
views Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-08-04 16:01:37 -07:00