Merge branch 'master' into users

2017-11-30 08:24:23 +01:00 · 2017-11-30 08:24:23 +01:00 · 58185d2652
parent d7293af2e3 4ecbd0e363
commit 58185d2652
14 changed files with 1 additions and 0 deletions
--- a/config/config.cfg.default
+++ b/config/config.cfg.default
@ -47,6 +47,7 @@ zmq_url=tcp://localhost:50000
 db=0
 channel=1
 channelLastContributor = lastContributor
+channelLastAwards = lastAwards

 [RedisMap]
 db=1
--- a/static/pics/MISPTrophy/0.png
+++ b/static/pics/MISPTrophy/0.png
--- a/static/pics/MISPTrophy/1.png
+++ b/static/pics/MISPTrophy/1.png
--- a/static/pics/MISPTrophy/10.png
+++ b/static/pics/MISPTrophy/10.png
--- a/static/pics/MISPTrophy/11.png
+++ b/static/pics/MISPTrophy/11.png
--- a/static/pics/MISPTrophy/12.png
+++ b/static/pics/MISPTrophy/12.png
--- a/static/pics/MISPTrophy/2.png
+++ b/static/pics/MISPTrophy/2.png
--- a/static/pics/MISPTrophy/3.png
+++ b/static/pics/MISPTrophy/3.png
--- a/static/pics/MISPTrophy/4.png
+++ b/static/pics/MISPTrophy/4.png
--- a/static/pics/MISPTrophy/5.png
+++ b/static/pics/MISPTrophy/5.png
--- a/static/pics/MISPTrophy/6.png
+++ b/static/pics/MISPTrophy/6.png
--- a/static/pics/MISPTrophy/7.png
+++ b/static/pics/MISPTrophy/7.png
--- a/static/pics/MISPTrophy/8.png
+++ b/static/pics/MISPTrophy/8.png
--- a/static/pics/MISPTrophy/9.png
+++ b/static/pics/MISPTrophy/9.png