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)
commitdf6d3a400aec117aa2adb9650a3ffc97e46c317d
tree29cb0b5e398756ad2f876dc76f5ac4c1a06511f3
parent729b328ca7d7d3d909ee98ae4e998fff9618ddfa
parent6e32c64b809e5fe6b68e78814654753bd4e675a8
Merge branch 'content-security-policy'.
src/main.c