Skip to content

Commit

Permalink
Merge branch 'main' into add-friend-ui-different
Browse files Browse the repository at this point in the history
  • Loading branch information
arvid220u authored Jul 8, 2022
2 parents 96df23e + b014cf1 commit 0feb1ab
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 2 deletions.
1 change: 1 addition & 0 deletions .bazelignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
gui/node_modules
2 changes: 2 additions & 0 deletions .clang-tidy
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
HeaderFilterRegex: \./.+
Checks:
'*,
-cppcoreguidelines-init-variables,
-google-readability-todo,
-cert-err58-cpp,
-cppcoreguidelines-avoid-non-const-global-variables,
-cppcoreguidelines-owning-memory,
Expand Down
2 changes: 2 additions & 0 deletions .trunk/.gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
*out
external
logs
4 changes: 2 additions & 2 deletions .trunk/trunk.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
version: 0.1
cli:
version: 0.13.2-beta
version: 0.14.1-beta
repo:
repo:
host: github.com
Expand Down Expand Up @@ -28,4 +28,4 @@ lint:
- [email protected]
- [email protected]
- [email protected]
- [email protected]
- [email protected]
1 change: 1 addition & 0 deletions gui/tailwind.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
// SPDX-License-Identifier: GPL-3.0-only
//

/** @type {import('tailwindcss').Config} */
module.exports = {
purge: ["./src/**/*.{js,jsx,ts,tsx}"],
plugins: [require("@tailwindcss/forms")],
Expand Down

0 comments on commit 0feb1ab

Please sign in to comment.