Commit 323c124d authored by Boris Fomitchev's avatar Boris Fomitchev
Browse files

Merge remote-tracking branch 'upstream/master' into parallel-nemo

parents 5c04ceb3 bdc52c19
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@
# limitations under the License.

MAJOR = 1
MINOR = 0
MINOR = 1.1

# Use the following formatting: (major, minor)
VERSION = (MAJOR, MINOR)