nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
diaspora/app
History
ilya 4ecda6ab8f Merge branch 'master' of github.com:diaspora/diaspora into invites 
Conflicts:
	Gemfile
	Gemfile.lock
2010-10-07 18:20:51 -07:00
..
controllers Merge branch 'master' of github.com:diaspora/diaspora 2010-10-07 17:34:03 -07:00
helpers Add or later to license notice 2010-10-07 16:25:34 -07:00
models Merge branch 'master' of github.com:diaspora/diaspora into invites 2010-10-07 18:20:51 -07:00
uploaders Add or later to license notice 2010-10-07 16:25:34 -07:00
views Merge branch 'master' of github.com:diaspora/diaspora 2010-10-07 16:56:22 -07:00