nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
diaspora/config/locales
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
..
devise Merge remote branch 'minilibra/master' 2010-10-07 17:32:20 -07:00
diaspora Merge remote branch 'minilibra/master' 2010-10-07 17:32:20 -07:00
devise.en.yml Merge branch 'master' of github.com:diaspora/diaspora into invites 2010-10-07 18:20:51 -07:00
devise_invitable.en.yml Merge branch 'master' of github.com:diaspora/diaspora into invites 2010-10-07 18:20:51 -07:00