diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2010-11-20 02:52:28 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2010-11-20 02:52:28 +0100 |
| commit | 63afe4e84cd3be5284a7126264c06ce87d191bc0 (patch) | |
| tree | 1ba8afc27b5aee7cdfb1d4abcde142b260c635b0 /.gitmodules | |
| parent | f65df4be0383b60b6a500f76f6405a6c5621df23 (diff) | |
| parent | 00697996e885044314cc297b72aaa86d69d2a219 (diff) | |
| download | Chimère-63afe4e84cd3be5284a7126264c06ce87d191bc0.tar.bz2 Chimère-63afe4e84cd3be5284a7126264c06ce87d191bc0.zip | |
Merge branch 'master' into carte-ouverte
Conflicts:
.gitignore
chimere/main/actions.py
chimere/urls.py
Diffstat (limited to '.gitmodules')
| -rw-r--r-- | .gitmodules | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..8905b55 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "chimere/static/jquery/bsmSelect"] + path = chimere/static/jquery/bsmSelect + url = git://github.com/vicb/bsmSelect.git |