Skip to content

Commit

Permalink
Merge branch 'master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
thoughtsunificator committed Jan 14, 2022
2 parents 32f1b47 + 011f0e9 commit 64eaff2
Show file tree
Hide file tree
Showing 7 changed files with 41,314 additions and 42,461 deletions.
Binary file modified apps/notejoy/notejoy-icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion apps/notejoy/notejoy.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: Notejoy
description: 'Collaborative notes for you and your team.'
description: 'Fast and focused notes for you and your team.'
website: 'https://notejoy.com'
keywords:
- note
Expand Down
18 changes: 9 additions & 9 deletions meta/colors.json
Original file line number Diff line number Diff line change
Expand Up @@ -7152,19 +7152,19 @@
}
},
"notejoy": {
"faintColorOnWhite": "rgba(206, 52, 52, 0.1)",
"goodColorOnBlack": "#D0D4D4",
"goodColorOnWhite": "#CE3434",
"faintColorOnWhite": "rgba(218, 30, 30, 0.1)",
"goodColorOnBlack": "#E33232",
"goodColorOnWhite": "#DA1E1E",
"palette": [
"#3a3737",
"#ce3434",
"#d0d4d4",
"#7b7777",
"#939394"
"#e33232",
"#fbfbfb",
"#efa1a1",
"#f4bcbc",
"#ec7c7c"
],
"source": {
"path": "apps/notejoy/notejoy-icon.png",
"revHash": "9972f7c580"
"revHash": "471094773f"
}
},
"notion": {
Expand Down
2,986 changes: 1,292 additions & 1,694 deletions meta/readmes.json

Large diffs are not rendered by default.

80,765 changes: 40,010 additions & 40,755 deletions meta/releases.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "electron-apps",
"version": "1.9120.0",
"version": "1.9129.0",
"description": "A collection of apps built on Electron",
"main": "index.json",
"scripts": {
Expand Down

0 comments on commit 64eaff2

Please sign in to comment.