]> git.openstreetmap.org Git - osqa.git/tree
Reverting the merges due to unsuccessfull conflict resolvement.
-rw-r--r-- 602 .project
-rw-r--r-- 159 INSTALL
-rw-r--r-- 681 LICENSE
-rw-r--r-- 0 __init__.py
drwxr-xr-x - cron
drwxr-xr-x - forum
drwxr-xr-x - forum_modules
drwxr-xr-x - locale
drwxr-xr-x - log
-rw-r--r-- 590 manage.py
-rw-r--r-- 695 osqa.iml
-rw-r--r-- 495 osqa.wsgi.dist
-rw-r--r-- 26 rmpyc
-rw-r--r-- 3569 settings.py
-rw-r--r-- 1413 settings_local.py.dist
drwxr-xr-x - tmp
-rw-r--r-- 321 urls.py