diff options
| author | Kornelius Kalnbach <murphy@rubychan.de> | 2014-12-18 21:28:24 +0100 |
|---|---|---|
| committer | Kornelius Kalnbach <murphy@rubychan.de> | 2014-12-18 21:28:24 +0100 |
| commit | 7aa6ea080d05b7e6a70b076b25f37b72fd7669ad (patch) | |
| tree | 5134dda976acfa6746a53fd9def12937701d9850 /lib/coderay/encoders/json.rb | |
| parent | bc4854fa426a39c2bd51b2fd1cfa0322a5a9a412 (diff) | |
| parent | 31a09b7599fb7c4b605869127e38617ce7619106 (diff) | |
| download | coderay-7aa6ea080d05b7e6a70b076b25f37b72fd7669ad.tar.gz | |
Merge branch 'master' into possible-speedups
Conflicts:
lib/coderay/encoders/html.rb
Diffstat (limited to 'lib/coderay/encoders/json.rb')
0 files changed, 0 insertions, 0 deletions