86a79783ed
Conflicts: bootstrapform/fixtures/basic.html bootstrapform/fixtures/horizontal.html tests/test_settings.py |
||
---|---|---|
.. | ||
test_settings.py |
86a79783ed
Conflicts: bootstrapform/fixtures/basic.html bootstrapform/fixtures/horizontal.html tests/test_settings.py |
||
---|---|---|
.. | ||
test_settings.py |