Commit Graph

6 Commits

Author SHA1 Message Date
Nick Cao
0da3a58aac
mautrix-googlechat: unstable-2023-01-25 -> unstable-2023-07-16
Diff: e2eb528745...f4cddafd47
2023-07-17 16:48:08 +08:00
Martin Weinelt
4bfe4794fa
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
- pkgs/development/python-modules/rich/default.nix
- pkgs/servers/mautrix-facebook/default.nix
- pkgs/servers/mautrix-googlechat/default.nix
- pkgs/servers/mautrix-signal/default.nix
- pkgs/top-level/python-aliases.nix
2023-03-12 19:23:32 +01:00
Sandro Jäckel
38d554a70c
python310Packages.commonmark: normalise pname 2023-03-12 00:25:40 +01:00
Martin Weinelt
225dbad50b
python310Packages.commonmark: Normalize attribute name 2023-02-19 21:35:59 +01:00
Nick Cao
f2cd0189ec
mautrix-googlechat: 0.4.0 -> unstable-2023-01-25 2023-01-31 14:02:37 +08:00
arcnmx
063ae6f8b1 mautrix-googlechat: init at 0.4.0 2022-11-26 11:16:57 -08:00