diff options
| author | Struan Donald <struan@exo.org.uk> | 2012-02-02 16:31:39 +0000 |
|---|---|---|
| committer | Struan Donald <struan@exo.org.uk> | 2012-02-02 16:31:39 +0000 |
| commit | a27d506f2f593bd64f5c744856dacac4e1f52420 (patch) | |
| tree | a3ec7dff4bb200e253b4b7b7530490a6fa94d786 /.gitignore | |
| parent | bd1be5d99f2c51f9fe2eb7751392b4b44fd74edc (diff) | |
| parent | b0e3c5065d86248e5d3d8bf9848193730ef60f1c (diff) | |
Merge branch 'packaging'
Conflicts:
.gitignore
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 4b9a80714..eac22039e 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ /private_locale ._* .DS_Store +.carton local-lib5 META.yml Makefile @@ -18,3 +19,4 @@ tags /web/css/core.css /web/css/main.css /web/cobrands/fixmystreet/*.css +/local |