nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:diaspora/diaspora

Browse source 
Conflicts:
	README.md
This commit is contained in:
Raphael 2010-09-22 15:52:16 -07:00
commit 40afef0763
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
README.md
View file

@ -1,6 +1,6 @@
## Commit Guidlines ## Commit Guidlines
You are welcome to contribute, add and extend Diaspora however you see fit. We You are welcome to contribute, add to and extend Diaspora however you see fit. We
will do our best to incorporate everything that meets our guidelines. will do our best to incorporate everything that meets our guidelines.
We need you to fill out a We need you to fill out a
@ -303,7 +303,6 @@ on port 8080. Change the port in config/app_config.yml.
Run `rake db:seed:tom`, then login with user `tom` and password `evankorth`. Run `rake db:seed:tom`, then login with user `tom` and password `evankorth`.
More details in db/seeds/tom.rb. More details in db/seeds/tom.rb.
### Testing ### Testing
Diaspora's test suite uses [rspec](http://rspec.info/), a behavior driven Diaspora's test suite uses [rspec](http://rspec.info/), a behavior driven