git.99rst.org / flatnotes.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e68b259 e962dee)
Merge branch 'refactor' into develop
authorAdam Dullage <redacted>
Sun, 4 Feb 2024 16:11:47 +0000 (16:11 +0000)
committerAdam Dullage <redacted>
Sun, 4 Feb 2024 16:11:47 +0000 (16:11 +0000)
1  2 
client/assets/fonts/Poppins/OFL.txt patch | diff1 | | blob | history
client/assets/fonts/Poppins/Poppins-Regular.ttf patch | diff1 | | blob | history
client/global.scss patch | diff1 | diff2 | blob | history
client/index.html patch | diff1 | diff2 | blob | history

diff --cc client/assets/fonts/Poppins/OFL.txt
index 76df3b565672e3248a5715339d092d4cb6c75019,0000000000000000000000000000000000000000..76df3b565672e3248a5715339d092d4cb6c75019
mode 100644,000000..100644
--- 1/flatnotes/src/assets/fonts/Poppins/OFL.txt
--- /dev/null
+++ b/client/assets/fonts/Poppins/OFL.txt
diff --cc client/assets/fonts/Poppins/Poppins-Regular.ttf
index 9f0c71b70a49664ced448c63edc9c4ff2bf8cf4a,0000000000000000000000000000000000000000..9f0c71b70a49664ced448c63edc9c4ff2bf8cf4a
mode 100644,000000..100644
Binary files differ
diff --cc client/global.scss
Simple merge
diff --cc client/index.html
Simple merge
git clone https://git.99rst.org/PROJECT