diff options
author | luxagraf <sng@luxagraf.net> | 2015-08-21 17:33:04 +0000 |
---|---|---|
committer | luxagraf <sng@luxagraf.net> | 2015-08-21 17:33:04 +0000 |
commit | 6ff5d738b9442c92fa6cc36477a3e099eb516f7d (patch) | |
tree | 8e4a535327f798873c132d48511448f0ee91b589 | |
parent | 9bea55be28958f12107ed1147b1b403063812166 (diff) | |
parent | 35209ab89eee8863051bc9b6f0fa5afb79c07df9 (diff) |
Merge branch 'master' of https://git.luxagraf.net/luxagraf
-rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -19,3 +19,4 @@ oldsite/ zbak/ 2015 config/settings.py +json/ |