Conflicts: CHANGELOG VERSION app/views/admin/teams/projects/new.html.haml app/views/projects/teams/available.html.haml doc/install/installation.md |
||
|---|---|---|
| .. | ||
| api | ||
| install | ||
| markdown | ||
| raketasks | ||
| update | ||
| make_release.md | ||
Conflicts: CHANGELOG VERSION app/views/admin/teams/projects/new.html.haml app/views/projects/teams/available.html.haml doc/install/installation.md |
||
|---|---|---|
| .. | ||
| api | ||
| install | ||
| markdown | ||
| raketasks | ||
| update | ||
| make_release.md | ||