Skip to content

Commit

Permalink
updated dependencies and added credits for russian locale.
Browse files Browse the repository at this point in the history
  • Loading branch information
jejacks0n committed Sep 22, 2012
1 parent 523a50d commit e220627
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Gemfile
@@ -1,6 +1,6 @@
source 'http://rubygems.org'

gem 'rails', '3.2.6'
gem 'rails', '3.2.8'

#Dependencies for the dummy app
gem 'jquery-rails'
Expand Down
4 changes: 3 additions & 1 deletion README.md
@@ -1,6 +1,7 @@
# Mercury Editor

[![Build Status](https://secure.travis-ci.org/jejacks0n/mercury.png?branch=master)](http://travis-ci.org/jejacks0n/mercury)
[![Dependency Status](https://gemnasium.com/jejacks0n/mercury.png)](https://gemnasium.com/jejacks0n/mercury)
[![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/jejacks0n/mercury)

Mercury Editor is a fully featured editor much like TinyMCE or CKEditor, but with a different usage paradigm. It
Expand Down Expand Up @@ -334,6 +335,7 @@ Translations and contributors:
- Swedish ([stefanm](https://github.com/stefanm))
- Simplified Chinese ([董劭田 DONG Shaotian](https://github.com/richarddong))
- Hungarian ([egivandor](https://github.com/egivandor))
- Russian ([ilyacherevkov](https://github.com/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
Expand Down Expand Up @@ -394,6 +396,6 @@ Mercury is fully tested using Jasmine (via Evergreen) and Cucumber. You can clo

Licensed under the [MIT License](http://creativecommons.org/licenses/MIT/)

Copyright 2011 [Jeremy Jackson](https://github.com/jejacks0n)
Copyright 2012 [Jeremy Jackson](https://github.com/jejacks0n)

Icons from [GLYPHICONS](http://www.glyphicons.com/)

0 comments on commit e220627

Please sign in to comment.