diff options
| author | redmatrix <git@macgirvin.com> | 2016-01-21 19:26:22 -0800 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-01-21 19:26:22 -0800 |
| commit | 75468c255a5fcb7d78a95e6c865d4d503efbfbfc (patch) | |
| tree | 72d43f8cc7fcb036b7a3027b056afaf9440ba266 | |
| parent | e52f64e3d2c646f6c6ed1f4710db707d23b279bf (diff) | |
| parent | dcaef756e7f9531bc4d1353b04ff44736032ffda (diff) | |
| download | volse-hubzilla-75468c255a5fcb7d78a95e6c865d4d503efbfbfc.tar.gz volse-hubzilla-75468c255a5fcb7d78a95e6c865d4d503efbfbfc.tar.bz2 volse-hubzilla-75468c255a5fcb7d78a95e6c865d4d503efbfbfc.zip | |
Merge https://github.com/redmatrix/hubzilla into pending_merge
| -rw-r--r--[-rwxr-xr-x] | library/HTMLPurifier/DefinitionCache/Serializer/README | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | library/font_awesome/src/assets/css/prettify.css | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | library/font_awesome/src/assets/js/ZeroClipboard-1.1.7.swf | bin | 1635 -> 1635 bytes | |||
| -rw-r--r--[-rwxr-xr-x] | library/stylish_select/stylish-select.css | 0 | ||||
| -rwxr-xr-x | util/shredder/JSON.sh | 1 |
5 files changed, 1 insertions, 0 deletions
diff --git a/library/HTMLPurifier/DefinitionCache/Serializer/README b/library/HTMLPurifier/DefinitionCache/Serializer/README index 2e35c1c3d..2e35c1c3d 100755..100644 --- a/library/HTMLPurifier/DefinitionCache/Serializer/README +++ b/library/HTMLPurifier/DefinitionCache/Serializer/README diff --git a/library/font_awesome/src/assets/css/prettify.css b/library/font_awesome/src/assets/css/prettify.css index aedd8d1a9..aedd8d1a9 100755..100644 --- a/library/font_awesome/src/assets/css/prettify.css +++ b/library/font_awesome/src/assets/css/prettify.css diff --git a/library/font_awesome/src/assets/js/ZeroClipboard-1.1.7.swf b/library/font_awesome/src/assets/js/ZeroClipboard-1.1.7.swf Binary files differindex 880e64ee7..880e64ee7 100755..100644 --- a/library/font_awesome/src/assets/js/ZeroClipboard-1.1.7.swf +++ b/library/font_awesome/src/assets/js/ZeroClipboard-1.1.7.swf diff --git a/library/stylish_select/stylish-select.css b/library/stylish_select/stylish-select.css index 1f3dcd28d..1f3dcd28d 100755..100644 --- a/library/stylish_select/stylish-select.css +++ b/library/stylish_select/stylish-select.css diff --git a/util/shredder/JSON.sh b/util/shredder/JSON.sh index 65f5f1f66..20c4d282e 100755 --- a/util/shredder/JSON.sh +++ b/util/shredder/JSON.sh @@ -1,3 +1,4 @@ +#!/bin/bash # The MIT License # # Copyright (c) 2011 Dominic Tarr |