github/diaspora
1
1
Fork 0
mirror of https://github.com/diaspora/diaspora.git synced 2026-04-29 03:01:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

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
parent 486b9e8bbe d0dbcd47fc
commit 40afef0763
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
README.md
View File

@@ -1,6 +1,6 @@
## 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.
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`.
More details in db/seeds/tom.rb.
### Testing
Diaspora's test suite uses [rspec](http://rspec.info/), a behavior driven