nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
diaspora/app
History
danielvincent 385e1673ab Merge branch 'master' into getting-started 
Conflicts:
	app/controllers/users_controller.rb
	app/views/users/_account.haml
	app/views/users/_profile.haml
2010-10-26 16:50:57 -07:00
..
controllers Merge branch 'master' into getting-started 2010-10-26 16:50:57 -07:00
helpers OmniauthService -> Service. Cleaned up views. 2010-10-25 17:41:59 -07:00
mailers update attachment with emails 2010-10-22 17:12:28 -07:00
models Merge branch 'master' into getting-started 2010-10-26 16:50:57 -07:00
uploaders Add or later to license notice 2010-10-07 16:25:34 -07:00
views Merge branch 'master' into getting-started 2010-10-26 16:50:57 -07:00