Merge branch 'master' into develop

This commit is contained in:
Richard van der Hoff 2019-02-14 14:42:03 +00:00
commit b02465b9db
6 changed files with 17 additions and 7 deletions

View file

@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
# Copyright 2014-2016 OpenMarket Ltd
# Copyright 2018 New Vector Ltd
# Copyright 2018-9 New Vector Ltd
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@ -27,4 +27,4 @@ try:
except ImportError:
pass
__version__ = "0.99.1rc1"
__version__ = "0.99.1"