Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-13 08:45:50 +01:00
Code Issues Packages Projects Releases Activity

Merge remote-tracking branch 'origin/stable'

Browse Source 
# Conflicts:
#	src/public/javascripts/desktop.js
#	src/views/desktop.ejs
#	src/views/mobile.ejs
This commit is contained in:
zadam
2020-03-07 22:21:55 +01:00
parent c4f7bb37db 78a50be663
commit 7105b61aab
5 changed files with 72 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/views/desktop.ejs
View File

@@ -74,6 +74,7 @@
<link href="stylesheets/themes.css" rel="stylesheet">
<link href="stylesheets/style.css" rel="stylesheet">
<link href="stylesheets/detail.css" rel="stylesheet">
<script src="javascripts/desktop.js" crossorigin type="module"></script>

1
src/views/mobile.ejs
View File

@@ -42,6 +42,7 @@
<link href="stylesheets/themes.css" rel="stylesheet">
<link href="stylesheets/style.css" rel="stylesheet">
<link href="stylesheets/detail.css" rel="stylesheet">
<link rel="stylesheet" type="text/css" href="libraries/boxicons/css/boxicons.min.css">