Aaron Andersen 086d1ad906 Merge pull request #75047 from kampka/trilium-server ...

Add trilium server and module

2019-12-22 20:26:57 -05:00

..

applications

Merge pull request #75047 from kampka/trilium-server

2019-12-22 20:26:57 -05:00

build-support

Merge master into staging-next

2019-12-19 09:19:50 +01:00

common-updater

…

data

Merge pull request #76192 from worldofpeace/pantheon-update-script

2019-12-22 18:56:13 -05:00

desktops

nixpkgs-github-update: don't malform header

2019-12-22 18:20:55 -05:00

development

Merge pull request #75300 from r-ryantm/auto-update/ocurl

2019-12-22 19:20:09 -05:00

games

Merge pull request #75280 from r-ryantm/auto-update/mnemosyne

2019-12-22 18:10:13 -05:00

misc

Merge pull request #76192 from worldofpeace/pantheon-update-script

2019-12-22 18:56:13 -05:00

os-specific

linux_latest-libre: 17119 -> 17142

2019-12-22 19:56:04 -05:00

servers

Merge pull request #74648 from r-ryantm/auto-update/shairport-sync

2019-12-22 18:18:53 -05:00

shells

oh-my-zsh: 2019-12-20 -> 2019-12-22

2019-12-22 20:11:22 -05:00

stdenv

allowInsecureDefaultPredicate: fix to use getName

2019-12-15 18:01:19 +00:00

test

…

tools

Merge pull request #76192 from worldofpeace/pantheon-update-script

2019-12-22 18:56:13 -05:00

top-level

Merge pull request #75047 from kampka/trilium-server

2019-12-22 20:26:57 -05:00