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: 2c58b1d464d8
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 53ca8b6a619a
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on May 7, 2020

  1. matrix-appservice-slack: 1.1.0 -> 1.2.0

    @kampka
    kampka committed May 7, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    kampka Christian Kampka
    GPG key ID: B88E140DB4FE1AA5
    Verified
    Learn about vigilant mode
    Copy the full SHA
    56ebdc6 View commit details

  2. Merge pull request #87185 from kampka/matrix-appservice-slack 

    matrix-appservice-slack: 1.1.0 -> 1.2.0
    @ryantm
    ryantm authored May 7, 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
    53ca8b6 View commit details
Showing with 427 additions and 267 deletions.
  1. +426 −266 pkgs/servers/matrix-synapse/matrix-appservice-slack/node-packages.nix
  2. +1 −1 pkgs/servers/matrix-synapse/matrix-appservice-slack/package.json
692 changes: 426 additions & 266 deletions pkgs/servers/matrix-synapse/matrix-appservice-slack/node-packages.nix
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

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.1.0" }
{"matrix-appservice-slack": "git+https://github.com/matrix-org/matrix-appservice-slack.git#1.2.0" }
]