Merge branch 'master' of github.com:benjaoming/django-wiki

9528bf71 · benjaoming · 2c35ea74 · 04ce91f7 · 9528bf71
Commit 9528bf71 authored Aug 12, 2013 by benjaoming
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

testproject/testproject/settings/local.py
+3 -0

No files found.
--- a/testproject/testproject/settings/local.py
+++ b/testproject/testproject/settings/local.py
 # Add your own changes here -- but do not push to remote!!
+# After changing the file, from root of repository execute:
+# git update-index --assume-unchanged testproject/testproject/settings/local.py