From: Javyer Der Derian <javier@tribalo.net>
Date: Wed, 15 Jan 2014 16:06:03 +0000 (-0800)
Subject: Merge pull request #11 from udacity/make_faq_settings_translatable
X-Git-Tag: live~29
X-Git-Url: https://git.openstreetmap.org./osqa.git/commitdiff_plain/0bd53bfd0a08e9949651ec35bf22048db8e740d9?hp=212778ba10f8e0a23f576d1caa5cc2837e9e2c2d

Merge pull request #11 from udacity/make_faq_settings_translatable

Make FAQ admin setting descriptions translateable
---

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..7b7b758
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,9 @@
+*.pyc
+.pydevproject
+.settings
+.project
+log/django.osqa.log
+tmp/*
+
+osqa.wsgi
+settings_local.py
diff --git a/README b/README
new file mode 100644
index 0000000..554535d
--- /dev/null
+++ b/README
@@ -0,0 +1,7 @@
+The OSQA project - open source Q&A system
+
+Project Q&A site - http://meta.osqa.net
+Homepage - http://www.osqa.net
+Bug tracking - http://jira.osqa.net
+Wiki - http://wiki.osqa.net
+
diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 0000000..fd43d5c
--- /dev/null
+++ b/requirements.txt
@@ -0,0 +1,10 @@
+markdown
+html5lib
+python-openid
+South
+python-memcached
+django==1.3.7
+django-debug-toolbar
+django-endless-pagination
+pytz
+