Merge branch 'master' into newmc

Conflicts:
	tmpl/pb_entry.en

diff --git a/js/90-divine-format.js b/js/90-divine-format.js
index cb9b6ab8f13baa7ef292aa52e2b8dc3ed4d4c46d..1fff289b867982064e00de50a6472d260c237ea1 100644 (file)
--- a/js/90-divine-format.js
+++ b/js/90-divine-format.js
@@ -41,6 +41,9 @@
                case 'py':
                        format = 'PYTHON';
                        break;
+               case 'rb':
+                       format = 'RUBY';
+                       break;
                }
 
                if(format)

diff --git a/tmpl/pb_entry.en b/tmpl/pb_entry.en
index ebb947cf4924814de19457aeb319043580f12c28..208c3cea01091c2c0b0b05de7db58ff96d0fe77d 100644 (file)
--- a/tmpl/pb_entry.en
+++ b/tmpl/pb_entry.en
@@ -40,6 +40,7 @@ To submit solutions to this problem, please visit the problem <a href="/pb/id">o
 <option value="PASCAL">Pascal (fpc 2.6.0)</option>
 <option value="PERL">Perl (perl 5.14.2)</option>
 <option value="PYTHON">Python (python 2.7.3)</option>
+<option value="RUBY">Ruby (ruby 2.2.1)</option>
 <option value="SBCL">Common Lisp (sbcl 1.0.57)</option>
 </select></div>