diff options
| author | Daniel Jones <daniel@danieljon.es> | 2017-12-22 20:34:02 -0500 |
|---|---|---|
| committer | Daniel Jones <daniel@danieljon.es> | 2017-12-22 20:34:02 -0500 |
| commit | 42bcdc03463dee8f69c05e14952c2a6a3ecffc44 (patch) | |
| tree | 0f918e2c170be18895c51b6071c96169465ecddb /settings.cfg | |
| parent | 5a146b4764d397ebf84cef4c12507cd940a2cc13 (diff) | |
| parent | c67d923b47838db993ef4d39e9a894d2471bfbc2 (diff) | |
| download | website-42bcdc03463dee8f69c05e14952c2a6a3ecffc44.tar.gz website-42bcdc03463dee8f69c05e14952c2a6a3ecffc44.zip | |
Merge branch 'master' of /home/daniel/git/website
merge template change
Diffstat (limited to 'settings.cfg')
0 files changed, 0 insertions, 0 deletions