Skip to content
This repository was archived by the owner on Apr 26, 2024. It is now read-only.

Commit b14f8a1

Browse files
committed
Merge branch 'master' into develop
2 parents 28f5252 + e713855 commit b14f8a1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+101
-71
lines changed

CHANGES.md

+88

changelog.d/10847.misc

-1
This file was deleted.

changelog.d/11161.feature

-1
This file was deleted.

changelog.d/11223.feature

-1
This file was deleted.

changelog.d/11228.feature

-1
This file was deleted.

changelog.d/11230.bugfix

-2
This file was deleted.

changelog.d/11236.feature

-1
This file was deleted.

changelog.d/11242.misc

-1
This file was deleted.

changelog.d/11247.misc

-1
This file was deleted.

changelog.d/11265.bugfix

-1
This file was deleted.

changelog.d/11278.misc

-1
This file was deleted.

changelog.d/11280.misc

-1
This file was deleted.

changelog.d/11281.doc

-1
This file was deleted.

changelog.d/11282.misc

-1
This file was deleted.

changelog.d/11285.misc

-1
This file was deleted.

changelog.d/11286.doc

-1
This file was deleted.

changelog.d/11287.misc

-1
This file was deleted.

changelog.d/11288.bugfix

-1
This file was deleted.

changelog.d/11292.misc

-1
This file was deleted.

changelog.d/11297.misc

-1
This file was deleted.

changelog.d/11298.doc

-1
This file was deleted.

changelog.d/11303.misc

-1
This file was deleted.

changelog.d/11307.misc

-1
This file was deleted.

changelog.d/11310.misc

-1
This file was deleted.

changelog.d/11311.misc

-1
This file was deleted.

changelog.d/11312.misc

-1
This file was deleted.

changelog.d/11313.misc

-1
This file was deleted.

changelog.d/11314.misc

-1
This file was deleted.

changelog.d/11316.misc

-1
This file was deleted.

changelog.d/11318.feature

-1
This file was deleted.

changelog.d/11320.doc

-1
This file was deleted.

changelog.d/11321.misc

-1
This file was deleted.

changelog.d/11322.misc

-1
This file was deleted.

changelog.d/11323.misc

-1
This file was deleted.

changelog.d/11324.feature

-1
This file was deleted.

changelog.d/11327.misc

-1
This file was deleted.

changelog.d/11328.misc

-1
This file was deleted.

changelog.d/11330.misc

-1
This file was deleted.

changelog.d/11332.misc

-1
This file was deleted.

changelog.d/11333.misc

-1
This file was deleted.

changelog.d/11335.feature

-1
This file was deleted.

changelog.d/11339.misc

-1
This file was deleted.

changelog.d/11340.bugfix

-1
This file was deleted.

changelog.d/11341.misc

-1
This file was deleted.

changelog.d/11342.misc

-1
This file was deleted.

changelog.d/11347.feature

-1
This file was deleted.

changelog.d/11352.feature

-1
This file was deleted.

changelog.d/11355.bugfix

-1
This file was deleted.

changelog.d/11359.misc

-1
This file was deleted.

changelog.d/11361.feature

-1
This file was deleted.

changelog.d/11368.misc

-1
This file was deleted.

changelog.d/11369.misc

-1
This file was deleted.

changelog.d/11370.misc

-1
This file was deleted.

changelog.d/11371.feature

-1
This file was deleted.

changelog.d/11377.bugfix

-1
This file was deleted.

changelog.d/11377.misc

-1
This file was deleted.

changelog.d/11379.bugfix

-1
This file was deleted.

changelog.d/11380.misc

-1
This file was deleted.

changelog.d/11381.doc

-1
This file was deleted.

changelog.d/11382.misc

-1
This file was deleted.

changelog.d/11386.misc

-1
This file was deleted.

changelog.d/11388.misc

-1
This file was deleted.

changelog.d/11389.misc

-1
This file was deleted.

changelog.d/11391.feature

-1
This file was deleted.

changelog.d/11392.bugfix

-1
This file was deleted.

changelog.d/11393.misc

-1
This file was deleted.

changelog.d/11395.removal

-1
This file was deleted.

changelog.d/11408.misc

-1
This file was deleted.

changelog.d/11421.bugfix

-1
This file was deleted.

changelog.d/11422.bugfix

-1
This file was deleted.

debian/changelog

+12
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
matrix-synapse-py3 (1.48.0) stable; urgency=medium
2+
3+
* New synapse release 1.48.0.
4+
5+
-- Synapse Packaging team <[email protected]> Tue, 30 Nov 2021 11:24:15 +0000
6+
7+
matrix-synapse-py3 (1.48.0~rc1) stable; urgency=medium
8+
9+
* New synapse release 1.48.0~rc1.
10+
11+
-- Synapse Packaging team <[email protected]> Thu, 25 Nov 2021 15:56:03 +0000
12+
113
matrix-synapse-py3 (1.47.1) stable; urgency=medium
214

315
* New synapse release 1.47.1.

synapse/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
except ImportError:
4848
pass
4949

50-
__version__ = "1.47.1"
50+
__version__ = "1.48.0"
5151

5252
if bool(os.environ.get("SYNAPSE_TEST_PATCH_LOG_CONTEXTS", False)):
5353
# We import here so that we don't have to install a bunch of deps when

0 commit comments

Comments
 (0)