Merge branch 'content-security-policy'.
authorDaniel Carl <danielcarl@gmx.de>
Sat, 8 Nov 2014 21:35:33 +0000 (22:35 +0100)
committerDaniel Carl <danielcarl@gmx.de>
Sat, 8 Nov 2014 21:35:33 +0000 (22:35 +0100)
1  2 
src/main.c

diff --cc src/main.c
Simple merge