nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
diaspora/config
History
Raphael 70a22ae839 Merge branch 'master' into HEAD 
Conflicts:
	app/models/post.rb
	app/models/user.rb
	config/initializers/socket.rb
2010-09-24 09:15:10 -07:00
..
environments Merge branch 'master' into HEAD 2010-09-24 09:15:10 -07:00
initializers Merge branch 'master' into HEAD 2010-09-22 21:32:03 -07:00
locales defaults doesn't really make sense when there's nothing else 2010-09-23 14:58:17 -07:00
sprinkle Merge branch 'master' of github.com:diaspora/diaspora 2010-09-17 15:33:51 -07:00
app_config.yml.example typo fix 2010-09-24 01:16:08 +08:00
application.rb Merge branch 'master' into HEAD 2010-09-24 09:15:10 -07:00
boot.rb Spell our own name right 2010-09-15 17:56:18 -07:00
deploy.rb tiny typo 2010-09-21 17:40:43 -07:00
deploy_config.yml deploy script now uses public url 2010-09-23 12:31:19 -07:00
environment.rb Adding Haml html escaping. 2010-09-17 07:44:23 +08:00
routes.rb Take out async controller until we actually put it in the app 2010-09-23 12:19:28 -07:00
selenium.yml Spell our own name right 2010-09-15 17:56:18 -07:00
thin.yml Move thin yml back to development mode 2010-09-20 12:51:47 -07:00