Merge remote-tracking branch 'upstream/master'

This commit is contained in:
hc 2015-11-04 16:20:52 +08:00
commit 240e08bacb
390 changed files with 23279 additions and 1968 deletions

View file

@ -1,4 +1,4 @@
encode64(){ echo -n $1 | base64 }
decode64(){ echo -n $1 | base64 -D }
encode64(){ printf '%s' $1 | base64 }
decode64(){ printf '%s' $1 | base64 --decode }
alias e64=encode64
alias d64=decode64