Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge conflict resolution bringing drop_gemfile_lock in.

  • Loading branch information...
commit fdfdd041cfeadfda99561d6f72554de36d23c4db 2 parents 58d076b + 9c40c21
@mixonic mixonic authored
View
2  features/loading/loading.feature
@@ -19,4 +19,4 @@ Feature:
Scenario: A user can expect to see the status bar
- Then I should see "Mercury Editor v0.3.0" within the statusbar
+ Then I should see "Mercury Editor v0.3.1" within the statusbar
View
2  public/mercury/javascripts/mercury.js
@@ -13278,7 +13278,7 @@ Showdown.converter = function() {
this.Mercury || (this.Mercury = {});
jQuery.extend(this.Mercury, {
- version: '0.3.0',
+ version: '0.3.1',
Regions: Mercury.Regions || {},
modalHandlers: Mercury.modalHandlers || {},
lightviewHandlers: Mercury.lightviewHandlers || {},
View
2  public/mercury/javascripts/mercury.min.js
1 addition, 1 deletion not shown
View
2  vendor/assets/javascripts/mercury/mercury.js.coffee
@@ -34,7 +34,7 @@
#
@Mercury ||= {}
jQuery.extend @Mercury,
- version: '0.3.0'
+ version: '0.3.1'
# Mercury object namespaces
Regions: Mercury.Regions || {}
Please sign in to comment.
Something went wrong with that request. Please try again.