diff options
| author | Robin Houston <robin.houston@gmail.com> | 2012-01-06 10:19:15 +0000 |
|---|---|---|
| committer | Robin Houston <robin.houston@gmail.com> | 2012-01-06 10:19:15 +0000 |
| commit | 12a5f07f6826166f7cc25214db54a6b75eb1e711 (patch) | |
| tree | 0a7dc16a67d8c7d78239e2da243d57de99673f05 | |
| parent | 042f5460fffd5d7b0c4ea538d070e129c485e618 (diff) | |
| parent | 4f27f3ad7cb99ac2180a86a24cd95bc5008d646d (diff) | |
Merge branch 'wdtk' of github.com:sebbacon/alaveteli into wdtk
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index efb25b8d8..e1f12f68c 100644 --- a/.gitignore +++ b/.gitignore @@ -16,4 +16,4 @@ TAGS /locale/model_attributes.rb /files/ /public/download -/public/alavetelitheme +/public/*theme |