diff options
| author | Adolfo Fitoria <adolfo.fitoria@gmail.com> | 2012-10-02 09:58:07 -0600 |
|---|---|---|
| committer | Adolfo Fitoria <adolfo.fitoria@gmail.com> | 2012-10-02 10:40:25 -0600 |
| commit | 2a398269923b779b63ca8432b6d98dc2ae6c6a50 (patch) | |
| tree | 3b946679a96442d2b0d3081a40624db124a7c1a9 /group_messaging/migrations/__init__.py | |
| parent | f1eda1494b753b052c82811419aff8380520ec85 (diff) | |
| parent | 8559f348eab0f59aa32d037a43d4a730112bab3c (diff) | |
| download | askbot-2a398269923b779b63ca8432b6d98dc2ae6c6a50.tar.gz askbot-2a398269923b779b63ca8432b6d98dc2ae6c6a50.tar.bz2 askbot-2a398269923b779b63ca8432b6d98dc2ae6c6a50.zip | |
Merge branch 'master' into haystack
Conflicts:
askbot/models/__init__.py
askbot/models/question.py
askbot/setup_templates/settings.py
askbot/setup_templates/settings.py.mustache
askbot/tests/__init__.py
askbot/tests/badge_tests.py
askbot/tests/db_api_tests.py
askbot/views/commands.py
askbot/views/readers.py
askbot/views/users.py
askbot/views/writers.py
Diffstat (limited to 'group_messaging/migrations/__init__.py')
| -rw-r--r-- | group_messaging/migrations/__init__.py | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/group_messaging/migrations/__init__.py b/group_messaging/migrations/__init__.py new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/group_messaging/migrations/__init__.py |