Browse files

updated dependencies and added credits for russian locale.

  • Loading branch information...
1 parent 523a50d commit e220627d6b71e0eed0cdb15cf0a54f485ae073d9 @jejacks0n committed Sep 22, 2012
Showing with 4 additions and 2 deletions.
  1. +1 −1 Gemfile
  2. +3 −1
@@ -1,6 +1,6 @@
source ''
-gem 'rails', '3.2.6'
+gem 'rails', '3.2.8'
#Dependencies for the dummy app
gem 'jquery-rails'
@@ -1,6 +1,7 @@
# Mercury Editor
[![Build Status](](
+[![Dependency Status](](
[![Code Climate](](
Mercury Editor is a fully featured editor much like TinyMCE or CKEditor, but with a different usage paradigm. It
@@ -334,6 +335,7 @@ Translations and contributors:
- Swedish ([stefanm](
- Simplified Chinese ([董劭田 DONG Shaotian](
- Hungarian ([egivandor](
+- Russian ([ilyacherevkov](
To add translations to your installation you'll first need to turn it on in the configuration and set the prefered
locale to one of those that's listed above (eg. `fr-CA`, or `pt-BR`). All you have to do after that is include the
@@ -394,6 +396,6 @@ Mercury is fully tested using Jasmine (via Evergreen) and Cucumber. You can clo
Licensed under the [MIT License](
-Copyright 2011 [Jeremy Jackson](
+Copyright 2012 [Jeremy Jackson](
Icons from [GLYPHICONS](

0 comments on commit e220627

Please sign in to comment.