diff --git a/lib/jasmine-core/jasmine.js b/lib/jasmine-core/jasmine.js index 5bb904dc..03bf89a0 100644 --- a/lib/jasmine-core/jasmine.js +++ b/lib/jasmine-core/jasmine.js @@ -2525,6 +2525,5 @@ jasmine.version_= { "major": 1, "minor": 2, "build": 0, - "revision": 1333557965, - "release_candidate": 3 + "revision": 1337005947 }; diff --git a/lib/jasmine-core/version.rb b/lib/jasmine-core/version.rb index d2aebcde..026512ad 100644 --- a/lib/jasmine-core/version.rb +++ b/lib/jasmine-core/version.rb @@ -1,6 +1,6 @@ module Jasmine module Core - VERSION = "1.2.0.rc3" + VERSION = "1.2.0" end end diff --git a/pages b/pages index 43dbf361..b928db73 160000 --- a/pages +++ b/pages @@ -1 +1 @@ -Subproject commit 43dbf3610377a6311423e14836ffd78ae0ed0f21 +Subproject commit b928db73fcb1070bd6a1bb73318b41202a1c2339 diff --git a/src/version.js b/src/version.js index 5372b943..e728798a 100644 --- a/src/version.js +++ b/src/version.js @@ -3,6 +3,5 @@ jasmine.version_= { "major": 1, "minor": 2, "build": 0, - "revision": 1333557965, - "release_candidate": 3 + "revision": 1337006083 }; diff --git a/src/version.json b/src/version.json index eb60841c..f9c57fa6 100644 --- a/src/version.json +++ b/src/version.json @@ -1,6 +1,5 @@ { "major": 1, "minor": 2, - "build": 0, - "release_candidate": 3 + "build": 0 }