diff options
| author | Louise Crow <louise.crow@gmail.com> | 2012-08-23 17:49:01 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2012-08-23 17:49:01 +0100 |
| commit | 5ea4882f38bcf18016c82c1e6119c4df5237e96e (patch) | |
| tree | a393c38b8b4273eee7f4a693c6f4c7a7bd55266f /doc/INSTALL.md | |
| parent | db8bb7fa5440855420b8f3ce24611a766e52f89e (diff) | |
| parent | a311a1892507aacec5bfb2837dd10f5257dfb42c (diff) | |
Merge remote-tracking branch 'origin/release/0.6.4' into wdtk
Conflicts:
app/views/request/show.rhtml
spec/models/info_request_spec.rb
Diffstat (limited to 'doc/INSTALL.md')
| -rw-r--r-- | doc/INSTALL.md | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/doc/INSTALL.md b/doc/INSTALL.md index b71b89676..588f8e4fe 100644 --- a/doc/INSTALL.md +++ b/doc/INSTALL.md @@ -19,12 +19,11 @@ Next, get hold of the Alaveteli source code from github: git clone https://github.com/sebbacon/alaveteli.git cd alaveteli -This will get the current stable release from the master branch (which -always contains the latest release). If you are a developer and want -to add or try new features, you might want to swap to the development -branch: +This will get the development branch, which has the latest (possibly +buggy) code. If you don't want to add or try new features, swap to the +master branch (which always contains the latest stable release): - git checkout develop + git checkout master # Install system dependencies |