diff options
| author | Seb Bacon <seb.bacon@gmail.com> | 2011-03-10 12:21:40 +0000 |
|---|---|---|
| committer | Seb Bacon <seb.bacon@gmail.com> | 2011-03-10 12:21:40 +0000 |
| commit | a731f9ff933223426404b113938ee185e0911075 (patch) | |
| tree | 2c51c779eedd2179d372dfcc2d5d374ff9cf8629 /.gitmodules | |
| parent | 4068c20d3218165fd9db085c2fa0465db799ee8f (diff) | |
fix bad merges from rebase with master
Diffstat (limited to '.gitmodules')
| -rw-r--r-- | .gitmodules | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/.gitmodules b/.gitmodules index 55f1b9652..78f90064f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -6,4 +6,7 @@ url = https://github.com/rails/rails.git [submodule "vendor/rails-locales"] path = vendor/rails-locales - url = https://github.com/svenfuchs/rails-i18n.git
\ No newline at end of file + url = https://github.com/svenfuchs/rails-i18n.git +[submodule "vendor/plugins/alavetelitheme"] + path = vendor/plugins/alavetelitheme + url = https://github.com/sebbacon/alavetelitheme.git
\ No newline at end of file |