From a295842ec4b4e75078879d384be84b1c8974841f Mon Sep 17 00:00:00 2001 From: geekofalltrades Date: Tue, 15 Jul 2014 09:53:23 -0700 Subject: [master] Add test installation directory to .gitignore. --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 296c3c4f..62c309cc 100755 --- a/.gitignore +++ b/.gitignore @@ -53,3 +53,4 @@ recaptcha /db.sq3 *.DS_Store htmlcov +installation/* -- cgit v1.2.3-1-g7c22 From d3c777261a9f1110e454b0fa854698404cc218f8 Mon Sep 17 00:00:00 2001 From: Matt Dougherty Date: Fri, 29 Aug 2014 15:21:29 -0700 Subject: Remove duplicate 'WORDS_GIVE_AN_ANSWER_INTERESTING_TO_THIS_COMMUNITY' livesetting. --- askbot/conf/words.py | 9 --------- 1 file changed, 9 deletions(-) diff --git a/askbot/conf/words.py b/askbot/conf/words.py index be4eb191..5475a1c6 100644 --- a/askbot/conf/words.py +++ b/askbot/conf/words.py @@ -848,15 +848,6 @@ settings.register( ) ) -settings.register( - values.StringValue( - WORDS, - 'WORDS_GIVE_AN_ANSWER_INTERESTING_TO_THIS_COMMUNITY', - default=_('give an answer interesting to this community'), - description=_('give an answer interesting to this community'), - ) -) - settings.register( values.StringValue( WORDS, -- cgit v1.2.3-1-g7c22 From b9dcc06ecb2e8ae57ecf0915c81dbc674ab98c25 Mon Sep 17 00:00:00 2001 From: Matt Dougherty Date: Fri, 29 Aug 2014 15:27:37 -0700 Subject: Remove installation directory from .gitignore for pull request back to Askbot. --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index 62c309cc..296c3c4f 100755 --- a/.gitignore +++ b/.gitignore @@ -53,4 +53,3 @@ recaptcha /db.sq3 *.DS_Store htmlcov -installation/* -- cgit v1.2.3-1-g7c22