summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge tag 'debian/0.33.9-2' into debian/stretch-backportsdebian/0.33.9-2_bpo9+1Andrej Shadura2018-12-18
|\
| * Update the changelogdebian/0.33.9-2Andrej Shadura2018-11-23
| * Merge tag 'upstream/0.33.9' into debian/masterAndrej Shadura2018-11-23
| |\
| | * New upstream version 0.33.9Richard van der Hoff2018-11-20
| * | Update the changelogdebian/0.33.8-1Andrej Shadura2018-11-02
| * | Refresh patches, update dependenciesAndrej Shadura2018-11-02
| * | Merge branch 'upstream/latest' into debian/masterAndrej Shadura2018-11-02
| |\|
| | * New upstream version 0.33.8Erik Johnston2018-11-01
| | * New upstream version 0.33.7Richard van der Hoff2018-10-18
| | * Imported Upstream version 0.33.6Richard van der Hoff2018-10-04
| | * Imported Upstream version 0.33.5.1Richard van der Hoff2018-09-24
| | * Imported Upstream version 0.33.5Richard van der Hoff2018-09-24
| * | Wrap and sort debian/controlAndrej Shadura2018-09-12
| * | Normalise whitespaceAndrej Shadura2018-09-12
* | | Rebuild for stretch-backportsdebian/0.33.4-1_bpo9+1Andrej Shadura2018-09-17
|/ /
* | Merge tag debian/0.33.3.1-1 into debian/masterdebian/0.33.4-1Andrej Shadura2018-09-12
|\ \
| * | Update the changelogdebian/0.33.3.1-1Andrej Shadura2018-09-06
| * | Update upstream source from tag 'upstream/0.33.3.1'Andrej Shadura2018-09-06
| |\ \
| | * | New upstream version 0.33.3.1Andrej Shadura2018-09-06
| * | | Add an unfinalised changelog entryAndrej Shadura2018-09-06
| * | | Merge branch 'upstream/latest' into debian/masterAndrej Shadura2018-09-06
| |\| |
| | * | Fix origin handling for pushed transactionsRichard van der Hoff2018-09-06
| | * | Check that signatures on events are validRichard van der Hoff2018-09-06
* | | | Update the changelogAndrej Shadura2018-09-12
* | | | Rename the patchAndrej Shadura2018-09-12
* | | | Merge remote-tracking branch 'matrix/debian' into debian/masterAndrej Shadura2018-09-12
|\ \ \ \
| * | | | 0.33.4-1mx1Richard van der Hoff2018-09-07
| * | | | Avoid telling people to install packages with pipRichard van der Hoff2018-09-07
| * | | | Refresh patches for synapse v0.33.4Richard van der Hoff2018-09-07
| * | | | Merge tag 'upstream/0.33.4' into debianRichard van der Hoff2018-09-07
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | 0.33.3.1-1mx1Richard van der Hoff2018-09-06
| * | | | Merge tag 'upstream/0.33.3.1' into debianRichard van der Hoff2018-09-06
| |\ \ \ \
* | \ \ \ \ Merge tag 'upstream/0.33.4' into debian/masterAndrej Shadura2018-09-12
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Imported Upstream version 0.33.4Richard van der Hoff2018-09-07
| | |/ / / | |/| | |
| * | | | Imported Upstream version 0.33.3.1Richard van der Hoff2018-09-06
| * | | | Merge remote-tracking branch 'origin/upstream' into upstreamRichard van der Hoff2018-08-24
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Imported Upstream version 0.33.1Erik Johnston2018-08-02
* | | | | Merge new configuration keysAndrej Shadura2018-09-05
| |_|_|/ |/| | |
* | | | Finalise the changelogdebian/0.33.3-2Andrej Shadura2018-09-05
* | | | Merge branch matrix/master into debian/masterAndrej Shadura2018-09-05
|\ \ \ \ | | |_|/ | |/| |
| * | | 0.33.3-2Richard van der Hoff2018-08-23
| * | | Add recommendations on python-lxml and python-psycopg2Richard van der Hoff2018-08-23
| * | | remove explicit dependency on python-attrRichard van der Hoff2018-08-23
| * | | Bump twisted dependency to 17.1.0Richard van der Hoff2018-08-23
* | | | Update the changelogdebian/0.33.3-1Andrej Shadura2018-08-22
* | | | Drop obsolete recaptcha patchAndrej Shadura2018-08-22
* | | | No need to exclude recaptcha anymore.Andrej Shadura2018-08-22
* | | | Merge remote-tracking branch 'matrix/debian' into debian/masterAndrej Shadura2018-08-22
|\| | |
| * | | 0.33.3-1Richard van der Hoff2018-08-22
| * | | Merge tag 'upstream/0.33.3' into debianRichard van der Hoff2018-08-22
| |\| |