Merge branch 'master' into production

This commit is contained in:
Mokaddem 2016-08-08 09:26:58 +02:00
commit 1c40ad522f

View file

@ -9,7 +9,7 @@ protocolstrending_csv = var/www/static/csv/protocolstrendingdata
protocolsfile = files/protocolsfile
tldstrending_csv = var/www/static/csv/tldstrendingdata
tldsfile = AILENV/faup/src/data/mozilla.tlds
tldsfile = faup/src/data/mozilla.tlds
domainstrending_csv = var/www/static/csv/domainstrendingdata