- Committer: Whit Morriss
- Date: 2014-10-28 14:37:41 UTC
- mfrom: (26.1.2 trunk)
- Revision ID: whit.morriss@canonical.com-20141028143741-211suz8eqnycy3tr
Merge branch 'master' of github.com:whitmo/cf-admin-ui
Conflicts:
hooks/actions.py
Conflicts:
hooks/actions.py
| Filename | Latest Rev | Last Changed | Committer | Comment | Size | ||
|---|---|---|---|---|---|---|---|
 ..
|
|||||||
Gemfile.lock |
26 | 9 years ago | Whit Morriss | install our own gemfile lock file - to workaroun | 1.6 KB |
|
|
|
upstart.conf |
21 | 9 years ago | Whit Morriss | Add bash to upstart conf point to other repo | 185 bytes |
|
|