Viewing all changes in revision 32.
- Committer: Mark Mims
- Date: 2013-03-14 22:29:26 UTC
- mfrom: (29.2.5 trunk)
- Revision ID: mark.mims@canonical.com-20130314222926-4ntlgsl8mmbxccqr
merging lp:~juju-gui/charms/precise/juju-gui/trunk per https://code.launchpad.net/~juju-gui/charms/precise/juju-gui/trunk/+merge/152429
- files added:
- config/haproxy.cfg.template
- files renamed:
- config/nginx.conf.template => config/nginx-site.template
- config/juju-gui.conf.template => config/nginx.conf
- files modified:
- HACKING.md
expand all
collapse all
added
removed
