Raphael 9309be2d69 Merge branch 'import' ...

Conflicts:
	spec/models/user/invite_spec.rb

2010-10-19 16:06:48 -07:00

..

environments

trying the mailer_condig

2010-10-07 16:54:38 -07:00

initializers

Merge branch 'invites' of github.com:diaspora/diaspora into invites

2010-10-11 11:52:57 -07:00

locales

fixed no friends/posts message positioning

2010-10-19 12:28:54 -07:00

sprinkle

Add or later to license notice

2010-10-07 16:25:34 -07:00

app_config.yml.example

Add or later to license notice

2010-10-07 16:25:34 -07:00

application.rb

Add or later to license notice

2010-10-07 16:25:34 -07:00

boot.rb

Add or later to license notice

2010-10-07 16:25:34 -07:00

cucumber.yml

Add cucumber and run the generator

2010-09-26 11:35:50 -04:00

deploy_config.yml

Add or later to license notice

2010-10-07 16:25:34 -07:00

deploy.rb

Add or later to license notice

2010-10-07 16:25:34 -07:00

environment.rb

Add or later to license notice

2010-10-07 16:25:34 -07:00

fb_config.yml

made a public view, copied the fb publisher there

2010-09-23 12:18:26 -07:00

fb_config.yml.example

added fb_config to gitignore

2010-10-05 12:21:33 -07:00

routes.rb

MS DG; basic view support; it works, but it is ugly

2010-10-13 18:42:24 -07:00

selenium.yml

Add or later to license notice

2010-10-07 16:25:34 -07:00

server.sh

Add a configuration file

2010-10-19 08:26:43 +02:00

thin.yml

Add or later to license notice

2010-10-07 16:25:34 -07:00