diff options
| author | Robin Houston <robin@lenny.robin> | 2011-06-14 23:33:41 +0100 |
|---|---|---|
| committer | Robin Houston <robin@lenny.robin> | 2011-06-14 23:33:41 +0100 |
| commit | 413184776338e621cd3bc5a2ae7083a763b607a9 (patch) | |
| tree | c452044e9678b4effce49e33212442cba8e19ca9 | |
| parent | 6bef246b141a69e9eccdb74272d2b57fb48998a0 (diff) | |
| parent | 1c3fb7fc04fcad5f7a28f8054c55183bff585fc8 (diff) | |
Merge branch 'master' of git@github.com:sebbacon/alaveteli
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | .gitmodules | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore index 911f019c6..2c48e6f94 100644 --- a/.gitignore +++ b/.gitignore @@ -10,4 +10,5 @@ /db/test_structure.sql moo.txt *#*# -TAGS
\ No newline at end of file +TAGS +vendor/plugins/*theme diff --git a/.gitmodules b/.gitmodules index 3ad819b24..5bd943c5b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,6 +7,3 @@ [submodule "vendor/rails-locales"] path = vendor/rails-locales url = git://github.com/svenfuchs/rails-i18n.git -[submodule "vendor/plugins/alavetelitheme"] - path = vendor/plugins/alavetelitheme - url = git://github.com/sebbacon/alavetelitheme.git |