Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: f688b2b4212c
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 87d370555ed2
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Jun 23, 2020

  1. matrix-appservice-slack: 1.3.1 -> 1.4.0

    @kampka
    kampka committed Jun 23, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    davidtwco David Wood
    GPG key ID: 2592E76C87381FD9
    Verified
    Learn about vigilant mode
    Copy the full SHA
    c5a80c2 View commit details

Commits on Jul 5, 2020

  1. Merge pull request #91365 from kampka/matrix-appservice-slack 

    matrix-appservice-slack: 1.3.1 -> 1.4.0
    @bhipple
    bhipple authored Jul 5, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    87d3705 View commit details
Showing with 548 additions and 488 deletions.
  1. +547 −487 pkgs/servers/matrix-synapse/matrix-appservice-slack/node-packages.nix
  2. +1 −1 pkgs/servers/matrix-synapse/matrix-appservice-slack/package.json
1,034 changes: 547 additions & 487 deletions pkgs/servers/matrix-synapse/matrix-appservice-slack/node-packages.nix
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pkgs/servers/matrix-synapse/matrix-appservice-slack/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[
{"matrix-appservice-slack": "git+https://github.com/matrix-org/matrix-appservice-slack.git#1.3.1" }
{"matrix-appservice-slack": "git+https://github.com/matrix-org/matrix-appservice-slack.git#1.4.0" }
]