]> jfr.im git - irc/freenode/Sigyn.git/commitdiff
Merge branch 'master' of https://github.com/freenode/Sigyn
authorNicolas Coevoet <redacted>
Sun, 31 Jan 2016 14:29:34 +0000 (15:29 +0100)
committerNicolas Coevoet <redacted>
Sun, 31 Jan 2016 14:29:34 +0000 (15:29 +0100)
1  2 
plugin.py

diff --cc plugin.py
Simple merge