diff options
| author | Richard van der Hoff <richard@matrix.org> | 2020-05-14 18:12:00 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2020-05-14 18:12:00 +0100 |
| commit | ec0b72bc4ed2015c1bc77e91bf50d6632029644c (patch) | |
| tree | 1ad1f1ca00bb65f9af5816714c9d8367b6ea7a3f /docs/dev/git | |
| parent | Enforce MSC2209: auth rules for notifications in power level event (#7502) (diff) | |
| parent | remove spurious changelog files (diff) | |
| download | synapse-ec0b72bc4ed2015c1bc77e91bf50d6632029644c.tar.xz | |
Merge branch 'master' into develop
Diffstat (limited to 'docs/dev/git')
| -rw-r--r-- | docs/dev/git/branches.jpg | bin | 0 -> 72228 bytes |
| -rw-r--r-- | docs/dev/git/clean.png | bin | 0 -> 110840 bytes |
| -rw-r--r-- | docs/dev/git/squash.png | bin | 0 -> 29667 bytes |
3 files changed, 0 insertions, 0 deletions
diff --git a/docs/dev/git/branches.jpg b/docs/dev/git/branches.jpg new file mode 100644 index 0000000000..715ecc8cd0 --- /dev/null +++ b/docs/dev/git/branches.jpg Binary files differdiff --git a/docs/dev/git/clean.png b/docs/dev/git/clean.png new file mode 100644 index 0000000000..3accd7ccef --- /dev/null +++ b/docs/dev/git/clean.png Binary files differdiff --git a/docs/dev/git/squash.png b/docs/dev/git/squash.png new file mode 100644 index 0000000000..234caca3e4 --- /dev/null +++ b/docs/dev/git/squash.png Binary files differ |
