diff options
author | Paul "LeoNerd" Evans <paul@matrix.org> | 2014-12-15 11:19:30 +0000 |
---|---|---|
committer | Paul "LeoNerd" Evans <paul@matrix.org> | 2014-12-15 11:19:30 +0000 |
commit | 0aa8c0847876074b7985f7a5de73ff1d36af0e1a (patch) | |
tree | 8d1ac270bf3d0c91b2c0644544444493e53021c0 /VERSION | |
parent | Send list of typing user IDs as 'user_ids' list within 'content', so that m.t... (diff) | |
parent | Merge branch 'hotfixes-v0.5.4' of github.com:matrix-org/synapse into develop (diff) | |
download | synapse-0aa8c0847876074b7985f7a5de73ff1d36af0e1a.tar.xz |
Merge branch 'develop' into typing_notifications
Diffstat (limited to 'VERSION')
-rw-r--r-- | VERSION | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/VERSION b/VERSION index 7d8568351b..64c6e2f460 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.5.4 +0.5.4a |