Merge remote-tracking branch 'origin/main'

flarum · Nov 16, 2022 · 18bdd48 · 18bdd48
2 parents f49cf88 + 2b413b0
commit 18bdd48
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,6 @@
 # Changelog
 
+
 ## [v1.6.0](https://github.com/flarum/framework/compare/v1.5.0...v1.6.0)
 ### Fixed
 - (approval) posts approved for deleted users error ([b5874a0](b5874a08e482196f50af50aa78e43c93c29fb647))

diff --git a/framework/core/js/dist-typings/common/helpers/userOnline.d.ts b/framework/core/js/dist-typings/common/helpers/userOnline.d.ts
diff --git a/framework/core/js/dist/admin.js.map b/framework/core/js/dist/admin.js.map
diff --git a/framework/core/js/dist/forum.js.map b/framework/core/js/dist/forum.js.map
diff --git a/framework/core/js/src/common/helpers/userOnline.tsx b/framework/core/js/src/common/helpers/userOnline.tsx
@@ -3,7 +3,7 @@ import User from '../models/User';
 import icon from './icon';
 
 /**
- * The `useronline` helper displays a green circle if the user is online
+ * The `useronline` helper displays a green circle if the user is online.
  */
 export default function userOnline(user: User): Mithril.Vnode<{}, {}> | null {
   if (user.lastSeenAt() && user.isOnline()) {