summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2020-04-19 10:38:28 +0000
committerJesusaves <cpntb1@ymail.com>2020-04-19 10:38:28 +0000
commit5132612a6dcef5f06883dfc303f113ceb90538a4 (patch)
treea4fabfc5a22c6c805126d2b0ae9f6443768b99ec /conf
parent2b8cce201c629c119184198be9695575fe3e9e94 (diff)
parentdd684b533cd535950f4e7d08c4173dfe4b6527db (diff)
downloadserverdata-5132612a6dcef5f06883dfc303f113ceb90538a4.tar.gz
serverdata-5132612a6dcef5f06883dfc303f113ceb90538a4.tar.bz2
serverdata-5132612a6dcef5f06883dfc303f113ceb90538a4.tar.xz
serverdata-5132612a6dcef5f06883dfc303f113ceb90538a4.zip
Merge branch 'jesusalva/python' into 'master'
Cupid's Magic See merge request evol/serverdata!228
Diffstat (limited to 'conf')
0 files changed, 0 insertions, 0 deletions