Merge https://github.com/redmatrix/hubzilla into pending_merge

2016-01-21 19:26:22 -08:00 · 2016-01-21 19:26:22 -08:00 · 75468c255a
commit 75468c255a
parent e52f64e3d2 dcaef756e7
5 changed files with 1 additions and 0 deletions
--- a/library/HTMLPurifier/DefinitionCache/Serializer/README
+++ b/library/HTMLPurifier/DefinitionCache/Serializer/README
--- a/library/font_awesome/src/assets/css/prettify.css
+++ b/library/font_awesome/src/assets/css/prettify.css
--- a/library/font_awesome/src/assets/js/ZeroClipboard-1.1.7.swf
+++ b/library/font_awesome/src/assets/js/ZeroClipboard-1.1.7.swf
--- a/library/stylish_select/stylish-select.css
+++ b/library/stylish_select/stylish-select.css
--- a/util/shredder/JSON.sh
+++ b/util/shredder/JSON.sh
@ -1,3 +1,4 @@
+#!/bin/bash
 # The MIT License
 #
 # Copyright (c) 2011 Dominic Tarr