Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-02 11:26:15 +01:00
Code Issues Packages Projects Releases Activity
5,830 Commits 42 Branches 349 Tags
1a6c9be0656d76f7327ff2884746c94a340d020e
Commit Graph

2 Commits

Author SHA1 Message Date
zadam
19126b7c6d Merge branch 'master' into next58 
# Conflicts:
#	libraries/ckeditor/ckeditor.js
#	libraries/ckeditor/ckeditor.js.map
#	package-lock.json
#	package.json
#	src/public/app/layouts/desktop_layout.js
 2022-11-22 20:46:08 +01:00
zadam
42cade17cb launchbar WIP 2022-08-05 16:44:26 +02:00