diff options
author | Paolo Tacconi <p.tacconi@giunti.it> | 2016-04-15 09:20:58 +0200 |
---|---|---|
committer | Paolo Tacconi <p.tacconi@giunti.it> | 2016-04-15 09:20:58 +0200 |
commit | 45a854762b451dafb882bc56efce054b64420627 (patch) | |
tree | 958fcd22f04546f40b6ac68bb58cfe1a1b1fb7f6 /util/shredder | |
parent | 1806da0851dd5cf5978b19d12783ae3101a11257 (diff) | |
parent | a29c0371f1f3cceb9a9af3a62e5ed67886869c40 (diff) | |
download | volse-hubzilla-45a854762b451dafb882bc56efce054b64420627.tar.gz volse-hubzilla-45a854762b451dafb882bc56efce054b64420627.tar.bz2 volse-hubzilla-45a854762b451dafb882bc56efce054b64420627.zip |
Resolved conflict in view/it/hstrings.php
Diffstat (limited to 'util/shredder')
-rwxr-xr-x | util/shredder/JSON.sh | 1 |
1 files changed, 1 insertions, 0 deletions
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 |