commit | 906efd9d070e0df89e9757efef12e18d5a73fed5 | [log] [tgz] |
---|---|---|
author | Shawn Pearce <sop@google.com> | Thu Jan 16 13:58:17 2014 -0800 |
committer | Shawn Pearce <sop@google.com> | Thu Jan 16 14:05:37 2014 -0800 |
tree | 4ed7ed0f2120eae53bb3d7310dc83c7c9a3a8754 | |
parent | bf50ea272459b270301a1d246a63597971dfd672 [diff] | |
parent | 59da23e4ca38d105fdc379aca165f2f6a8cf37b5 [diff] |
Merge branch 'stable-2.8' * stable-2.8: Codemirror: Add support for Groovy mode Codemirror: Add support for Clojure mode Codemirror: Add support for Lisp mode Codemirror: Add support for ruby mode Codemirror: Add support for perl mode Conflicts: gerrit-server/src/main/java/com/google/gerrit/server/DefaultFileExtensionRegistry.java Change-Id: Icf61f85ea50b02d63a222973d0781afe67e03ee6