nobody
b43ae97a46
fix signatures
2021-09-23 17:20:56 -07:00
nobody
b473b96527
Merge branch 'dev' of /home/macgirvin/z into dev
2021-09-23 16:39:33 -07:00
nobody
3a862cb6c8
Merge branch 'dev' of ../z into sitechan
2021-09-23 16:33:09 -07:00
nobody
82533f602b
update
2021-09-23 16:32:44 -07:00
nobody
17105fcd15
more sitechan backend stuff
2021-09-23 15:26:31 -07:00
nobody
319f3ce5e3
more work on site chan
2021-09-23 13:35:35 -07:00
nobody
f99db54419
sitechan updates
2021-09-20 22:51:28 -07:00
nobody
41de2d93d0
only include the ability to switch to the sys channel if the logged in user is admin
2021-09-17 14:19:59 -07:00
nobody
3f4d8d4ac8
Merge branch 'dev' into sitechan
2021-09-17 14:13:17 -07:00
nobody
04a4818640
Merge branch 'dev' of /home/macgirvin/z into dev
2021-09-16 16:24:41 -07:00
nobody
009e457f36
guest pass issue
2021-09-16 16:12:44 -07:00
nobody
fe78110c4b
sitechan work to new branch
2021-09-14 00:58:36 -07:00
nobody
bb7fb78b5e
Merge branch 'dev' of /home/macgirvin/z into dev
2021-09-13 04:29:29 -07:00
nobody
be41b4d120
suggestions: combine scores for social distance and keyword matches
2021-09-12 22:59:35 -07:00
nobody
0b8675a5b0
Merge branch 'dev' of /home/macgirvin/z into dev
2021-09-12 22:19:33 -07:00
nobody
3a6bb2ab2a
corrections to tag matching part of suggestion query
2021-09-12 21:20:42 -07:00
nobody
2d12e04b8a
social tag match (still testing)
2021-09-12 20:49:53 -07:00
nobody
0a69c8c535
Merge branch 'dev' of /home/macgirvin/z into dev
2021-09-08 01:39:37 -07:00
nobody
3d7c376422
hl => mark
2021-09-08 01:37:46 -07:00
nobody
11b4721681
Notifications API backend. Still needs cache/filter before enabling.
2021-09-06 23:32:54 -07:00
nobody
3a9324d327
zotsh -> nsh
2021-09-04 01:27:16 -07:00
nobody
95b99e5462
Merge branch 'dev' of /home/macgirvin/z into dev
2021-09-03 17:17:01 -07:00
nobody
a81a70c107
new function unpack_link_id to complement gen_link_id
2021-09-03 15:14:39 -07:00
nobody
2d2b9d97bc
bring back registration form validation
2021-08-31 06:15:14 -07:00
nobody
8686db666e
group tests
2021-08-30 15:46:34 -07:00
nobody
8b91fa4437
disallow direct view of data: attachments
2021-08-30 05:10:32 -07:00
nobody
a7db0aeaf4
Merge branch 'dev' of /home/macgirvin/z into dev
2021-08-28 23:48:40 -07:00
nobody
080bf86415
notification fixes cont.
2021-08-28 23:46:33 -07:00
nobody
b08966f75c
Merge branch 'dev' of /home/macgirvin/z into dev
2021-08-28 22:01:50 -07:00
nobody
ac02c174d3
different approach to solving the problem where a notification will appear for the parent for conversations you comment on.
2021-08-28 21:59:30 -07:00
nobody
e78cf015ba
update siteinfo.json
2021-08-28 18:56:37 -07:00
nobody
0220ac5c2b
Merge branch 'dev' of /home/macgirvin/z into dev
2021-08-28 02:18:30 -07:00
nobody
2ea178e0c3
version
2021-08-28 02:15:53 -07:00
nobody
80d1b176de
link files and photos views
2021-08-27 17:37:32 -07:00
nobody
8f7a5d2947
defer updates if comments in progress
2021-08-26 22:15:24 -07:00
nobody
851a6ace41
Merge branch 'dev' of /home/macgirvin/z into dev
2021-08-24 23:06:40 -07:00
nobody
f6d9500195
AP service actor record at site root
2021-08-24 22:59:48 -07:00
nobody
386892171c
Merge branch 'dev' of /home/macgirvin/z into dev
2021-08-18 14:49:59 -07:00
nobody
5eca3e4e8c
treat svg's as dangerous in filebrowser, cleanup atom validation, provide extra logging around the precise reason for allowed posts
2021-08-18 14:18:52 -07:00
nobody
50ac040704
Merge branch 'dev' of /home/macgirvin/z into dev
2021-08-12 13:19:02 -07:00
nobody
edbe7c013e
add animated gif check function, fix misty issue 3 (mysql is picky about when to use "default")
2021-08-12 13:04:44 -07:00
nobody
a3f68af9a9
Merge branch 'dev' of /home/macgirvin/z into dev
2021-08-03 17:31:22 -07:00
nobody
eda4a2c116
include/network:get_request_string() ignore fragments
2021-08-03 17:12:28 -07:00
nobody
c1a3e42479
Merge branch 'dev' of /home/macgirvin/z into dev
2021-07-31 04:17:47 -07:00
nobody
686cbed2e5
more consistent text
2021-07-31 04:13:51 -07:00
nobody
7c449a0b6a
Merge branch 'dev' of /home/macgirvin/z into dev
2021-07-27 23:59:30 -07:00
nobody
003650f8cc
Merge branch 'dev' of ../p3 into dev
2021-07-27 05:27:21 -07:00
nobody
0fd7ad5be0
dreport log
2021-07-27 05:26:47 -07:00
nobody
6e4d7c3f7d
Merge branch 'dev' of /home/macgirvin/z into dev
2021-07-26 15:27:43 -07:00
nobody
90d16e7884
Merge branch 'dev' of ../p3 into dev
2021-07-25 17:21:25 -07:00
nobody
3a03e6285c
some preliminary work on threaded comments refactor, bring back poke app.
2021-07-25 17:20:10 -07:00
nobody
4b8de363f2
Merge branch 'dev' of /home/macgirvin/z into dev
2021-07-24 14:58:32 -07:00
nobody
8c422bf2c9
provide separate network timeout settings for get and post. We can allow a bit more time for posting as this is nearly always done in the background, and a lot of sites seem to be running on under-powered hardware these days and are failing to respond within 60 seconds and are therefore effectively dead when it comes to pushing stuff.
2021-07-24 14:48:51 -07:00
nobody
e6d668356c
php8 warning
2021-07-22 03:57:52 -07:00
nobody
1dcea2925a
Merge branch 'dev' of /home/macgirvin/z into dev
2021-07-21 18:11:25 -07:00
nobody
853ff59f0f
php8 warnings, string and version update
2021-07-19 14:24:22 -07:00
nobody
3baade2087
Merge branch 'dev' of /home/macgirvin/z into dev
2021-07-18 16:20:42 -07:00
nobody
4666a150ae
fixes
2021-07-18 14:17:42 -07:00
nobody
83ddfb0dd3
Merge branch 'dev' of /home/macgirvin/z into dev
2021-07-13 22:36:01 -07:00
nobody
fe5c4528fc
php8 warnings
2021-07-13 22:31:46 -07:00
nobody
4c6c2c920d
Merge branch 'dev' of /home/macgirvin/z into dev
2021-07-12 23:52:52 -07:00
nobody
c333a4c5f2
bring back 'post_mail' permission, but remove PERMS_NETWORK as an option as it is ambiguous in Zap and derivatives
2021-07-12 17:24:49 -07:00
nobody
879af8a750
Merge branch 'dev' of /home/macgirvin/z into dev
2021-07-11 22:37:54 -07:00
nobody
ec74318ff0
php8 undefined warnings, cont.
2021-07-11 16:46:03 -07:00
nobody
28ad858121
chanview ui improvements
2021-07-11 14:41:51 -07:00
nobody
d1c158eed2
Merge branch 'dev' of /home/macgirvin/z into dev
2021-07-10 20:03:42 -07:00
nobody
69649197d1
php error in log statement due to preformatting the date when errors occur
2021-07-08 16:18:53 -07:00
nobody
39342526d4
more tweaks to remote profile photo cache storage function
2021-07-03 19:33:21 -07:00
nobody
95dbb252b9
...or I suppose we could just make it work correctly
2021-07-02 15:47:50 -07:00
nobody
9c601e8160
import_remote_xchan_photo(): modified check was incorrect ($outfile undefined), but it just adds complexity - so just fetch the photo.
2021-07-02 15:13:38 -07:00
nobody
45b22d9018
Merge branch 'dev' of /home/macgirvin/z into dev
2021-06-26 18:45:41 -07:00
nobody
7624107adf
re-enable 'supress_duplicates'
2021-06-26 18:44:46 -07:00
nobody
38e012179a
rework setup and include wording fix from zap pull #30 which could not be merged due to conflicts.
2021-06-25 15:40:15 -07:00
nobody
7f1e3d4923
Merge branch 'dev' of /home/macgirvin/z into dev
2021-06-25 02:50:03 -07:00
nobody
d2df20e41e
Hide original group DM from the group owner. We only keep it as a reference and its presence in the group owner's stream is confusing.
2021-06-25 01:32:57 -07:00
nobody
23f254091e
fine tuning group comments
2021-06-24 13:54:33 -07:00
nobody
d0925fec2d
mastogroups: provide a normal 'Announce' body if we have enough information to do so.
2021-06-24 00:44:41 -07:00
nobody
38e5b8d107
Merge branch 'dev' of /home/macgirvin/z into dev
2021-06-23 21:30:30 -07:00
nobody
633cadbf4e
provide full object if available
2021-06-23 17:13:10 -07:00
nobody
01c3c68b2c
more syntax issues from having a string item['obj']
2021-06-23 16:54:26 -07:00
nobody
73a6e614a8
syntax
2021-06-23 16:48:19 -07:00
nobody
f80f246d23
don't boost reactions
2021-06-23 01:52:52 -07:00
nobody
91f32b11ca
mastogroups - support moderation
2021-06-23 00:19:51 -07:00
nobody
efe8657cf2
mastogroups
2021-06-22 23:25:13 -07:00
nobody
a3c866768b
Merge branch 'dev' of /home/macgirvin/z into dev
2021-06-22 14:26:06 -07:00
nobody
9ad5568afd
commit some experimental work so that it doesn't create conflict later.
2021-06-22 02:16:28 -07:00
nobody
0a34b71a46
Merge branch 'dev' of /home/macgirvin/z into dev
2021-06-21 22:08:01 -07:00
nobody
cabed0682c
improved photo editing and alt text support
2021-06-21 22:03:11 -07:00
nobody
41f1159adc
Merge branch 'dev' of /home/macgirvin/z into dev
2021-06-21 00:38:33 -07:00
nobody
03e635677c
store photo tags with linked item
2021-06-19 20:16:08 -07:00
nobody
b127575110
permit item['obj'] and item['target'], etc. to contain a single URL in storage rather than an object array; it is still json_encoded.
...
disable/filter unicode right-to-left over-ride in content as it is often abused and can totally destroy presentation. Use HTML text-direction tags or CSS instead since the HTML purifier will force closure.
2021-06-19 16:04:32 -07:00
nobody
29fd3dad2c
tempfix
2021-06-18 22:47:42 -07:00
nobody
e0b5393817
Merge branch 'dev' of ../p3 into dev
2021-06-18 22:13:56 -07:00
nobody
5dde6a54c1
groups work from roadhouse
2021-06-18 22:12:23 -07:00
nobody
5ea7105272
ongoing: fix a few more php 8.x warnings
2021-06-18 16:54:08 -07:00
nobody
35ea8d7d7e
finish removal of deprecated server_role and sitelist
2021-06-17 14:54:15 -07:00
nobody
bff85bf5e4
names
2021-06-17 14:18:54 -07:00
nobody
7689676e7d
Merge branch 'dev' of /home/macgirvin/z into dev
2021-06-12 14:59:51 -07:00
nobody
441261e2d8
updates
2021-06-12 14:57:46 -07:00
nobody
735e2382a3
zid-enabled links leaking to signed AP fetches
2021-06-12 02:35:29 -07:00
nobody
1a2d4288d4
Merge branch 'dev' of /home/macgirvin/z into dev
2021-06-11 16:09:31 -07:00
nobody
c22877385c
mastodon group issue
2021-06-10 22:10:53 -07:00
nobody
fb26626822
add /conversation/ context to group top-level posts
2021-06-10 17:01:30 -07:00
nobody
7e7d4ae6a9
Merge branch 'dev' of /home/macgirvin/z into dev
2021-06-07 14:46:29 -07:00
nobody
e0d3ce0925
include some objects in embedded share group posts, just not notes/articles.
2021-06-07 14:35:21 -07:00
nobody
5c3770e646
array is null issue with guest posted photos
2021-06-07 14:09:30 -07:00
nobody
2aa8fab213
Merge branch 'dev' of /home/macgirvin/z into dev
2021-06-05 14:56:30 -07:00
nobody
661e34be81
misty issue 4 - admin option exists to enable invite_only mode, but the invite app was deprecated until it could be fixed. So remove the admin option until the app is reinstated.
2021-06-02 02:00:44 -07:00
nobody
d34998890e
Merge branch 'dev' of /home/macgirvin/z into dev
2021-05-27 04:19:27 -07:00
nobody
2c1f748347
revision
2021-05-27 04:17:19 -07:00
nobody
b5f57ad9db
Merge branch 'dev' of /home/macgirvin/z into dev
2021-05-27 04:10:08 -07:00
nobody
0a28510df6
move block_public_dir to security settings with the other block_public stuff
2021-05-26 16:56:54 -07:00
nobody
f529c7dc4b
Merge branch 'dev' of /home/macgirvin/z into dev
2021-05-20 18:54:27 -07:00
nobody
82eabd114b
per module loadtime
2021-05-20 18:47:10 -07:00
nobody
66b76f0ed6
Merge branch 'dev' of /home/macgirvin/z into dev
2021-05-20 18:22:09 -07:00
nobody
b5547eadbd
various bugfixes
2021-05-20 18:01:42 -07:00
nobody
ae6aa577e4
Merge branch 'dev' of /home/macgirvin/z into dev
2021-05-19 15:51:45 -07:00
nobody
39ffebbca5
Merge branch 'dev' of ../p3 into dev
2021-05-19 14:59:50 -07:00
nobody
5445aa8dbe
don't link hashtags inside HTML tags, add support for HTML 'mark' element in the purifier.
2021-05-19 14:58:18 -07:00
nobody
12d9796e8a
use 'Ignore' for unfollowing threads instead of 'Unfollow' which isn't specified in the ActivityStreams vocabulary. This is low impact since these activities do not federate. Updates to previously unfollowed threads may show up after this change and may require unfollowing again since existing activities were not modified.
2021-05-17 14:14:57 -07:00
nobody
ac3d15b307
Merge branch 'dev' of /home/macgirvin/z into dev
2021-05-11 17:29:45 -07:00
nobody
edd2737f56
fix posts to appendable collections arriving as normal posts if we don't host the target collection
2021-05-11 14:06:59 -07:00
nobody
a2a14bd571
Merge branch 'dev' of /home/macgirvin/z into dev
2021-05-07 17:00:06 -07:00
nobody
57de39db96
duplicated images (again)
2021-05-07 16:58:34 -07:00
nobody
a7a85966b7
missed a translation
2021-05-03 19:53:23 -07:00
nobody
46260ac1cc
Merge branch 'dev' of /home/macgirvin/z into dev
2021-05-02 16:43:33 -07:00
nobody
631904f145
Zot/10 = 'Nomad'
2021-05-02 16:41:18 -07:00
nobody
a105ee45b1
string update, check to see if activity target is already json_decoded
2021-04-29 22:37:19 -07:00
nobody
3aa90a042e
more smithereen group quirks
2021-04-29 21:24:30 -07:00
nobody
ab4ce52b76
BEGIN: deliver top-level post to groups via target collection (in addition to DM, simple mentions, and wall-to-wall posts)
2021-04-28 22:12:52 -07:00
nobody
489a94749f
Merge branch 'dev' of /home/macgirvin/z into dev
2021-04-27 17:19:38 -07:00
nobody
1a78e38646
Merge branch 'dev' of ../p3 into dev
2021-04-27 17:19:02 -07:00
nobody
42943ab824
more work on copy_of_pubitem issues
2021-04-27 17:18:18 -07:00
nobody
2a90d8b694
Merge branch 'dev' of /home/macgirvin/z into dev
2021-04-27 13:44:32 -07:00
nobody
4055f9494e
Merge branch 'dev' of ../p3 into dev
2021-04-27 13:43:18 -07:00
nobody
34c08f36e6
more logging of copy_of_pubitem to find issue
2021-04-27 13:40:27 -07:00
nobody
434c407d6f
add uploaded photos as attachments as well as inline
2021-04-26 21:32:37 -07:00
nobody
20a6b731d9
Merge branch 'dev' of /home/macgirvin/z into dev
2021-04-26 18:10:23 -07:00
nobody
0fad070e95
SQL issue with copy_of_pubitem when multiple copies of the post exist on this site
2021-04-26 18:08:14 -07:00
nobody
890ceea3ee
remove experimental setting on replyTo, limit incoming message size (regression), fix variable re-use in storage/basicauth, and add attachments for all attached photos/files.
2021-04-22 14:41:26 -07:00
nobody
b774664b38
Merge branch 'dev' of /home/macgirvin/z into dev
2021-04-21 17:57:28 -07:00
nobody
7bdfa610b3
more work on image cache
2021-04-20 23:26:47 -07:00
nobody
ede4dfd3ae
Merge branch 'dev' of /home/macgirvin/z into dev
2021-04-20 20:22:37 -07:00
nobody
9c72688c56
only return cache entry if it has contents
2021-04-20 19:33:06 -07:00
nobody
c3616bcc0f
Merge branch 'dev' of /home/macgirvin/z into dev
2021-04-18 13:19:26 -07:00
nobody
1f2981418e
move 'replyto' from initial concept to experimental stage
2021-04-17 16:34:36 -07:00
nobody
8bb42abfd6
update federation.md
2021-04-16 15:44:20 -07:00
nobody
577d63a5ed
prettify E2EE content
2021-04-15 17:07:20 -07:00
nobody
a59b6399fa
Merge branch 'dev' of /home/macgirvin/z into dev
2021-04-14 21:38:16 -07:00
nobody
179fdd3511
allow wildcard matching in admin site blocks
2021-04-14 21:23:01 -07:00
nobody
41927d89d6
Merge branch 'dev' of /home/macgirvin/z into dev
2021-04-14 17:41:53 -07:00
nobody
53d553f454
make sure your own site is always allowed if the default site policy is block everybody.
2021-04-14 17:33:21 -07:00
nobody
24f8be05d4
site filtering: Enable "block by default" if domains are entered in the allow list but there is no block list.
2021-04-14 13:40:56 -07:00
nobody
6e484c73c9
Merge branch 'dev' of /home/macgirvin/z into dev
2021-04-13 21:13:33 -07:00
nobody
a110783fe9
comment control issues
2021-04-13 21:07:24 -07:00
nobody
112a3463c1
Merge branch 'dev' of /home/macgirvin/z into dev
2021-04-13 18:46:54 -07:00
nobody
f0045a39a0
Merge branch 'dev' of ../p3 into dev
2021-04-12 21:28:21 -07:00
nobody
42f46df966
don't rewrite naked links inside markdown code blocks
2021-04-12 21:27:33 -07:00
nobody
87d5c7f000
atoken_abook() probably not needed any more since atoken entries are now added to abook automatically
2021-04-12 21:03:34 -07:00
nobody
0f62a46844
cleanup
2021-04-12 20:49:58 -07:00
nobody
3fca2da820
Merge branch 'dev' of /home/macgirvin/z into dev
2021-04-11 19:35:26 -07:00
nobody
31c46fdb13
prevent looping on the sync packet
2021-04-11 19:13:36 -07:00
nobody
959644ff83
Merge branch 'dev' of /home/macgirvin/z into dev
2021-04-11 17:56:54 -07:00
nobody
f8b7cb33d5
use network type 'token' for atoken xchans
2021-04-11 17:55:54 -07:00
nobody
f0cd89b062
allow reverse proxy to work with webfinger and other endpoints that normally require https
2021-04-11 16:27:44 -07:00
nobody
fa57e701d2
edge cases syncing atokens
2021-04-10 20:15:55 -07:00
nobody
361bcf68f9
typo
2021-04-10 18:43:30 -07:00
nobody
d9d4a47dbb
clone atokens and their associated structures
2021-04-10 18:41:35 -07:00
nobody
940541d8f6
delete atoken record if corresponding abook entry is removed
2021-04-10 15:45:19 -07:00
nobody
06d70288ef
porting access tokens and making them generally more useful by adding them to connections
2021-04-10 15:32:14 -07:00
nobody
7aee418044
some oauth work necessary for AP C2S. This appears to be heading down the path of favouritism towards oauth2 and deprecating openid connect. In theory we should be able to support both, but the underlying library isn't quite as flexible as hoped and appears to favour one or the other without involving multiple installations.
2021-04-10 00:51:12 -07:00
nobody
89d2c293e7
Merge branch 'dev' of /home/macgirvin/z into dev
2021-04-07 19:13:13 -07:00
nobody
9ffd12c251
Merge branch 'dev' of ../p3 into dev
2021-04-07 19:12:21 -07:00
nobody
38c2f8666b
allow setting the UA string for fetches
2021-04-07 19:11:55 -07:00
nobody
084438bffd
fixing nits
2021-04-07 19:11:15 -07:00
nobody
486197c88e
Merge branch 'dev' of /home/macgirvin/z into dev
2021-04-07 18:03:38 -07:00
nobody
52805a5ac6
Optionally post to groups via normal mentions unless the group is restricted. This aligns with the expectations of other fediverse projects and communities but isn't recommended, as content destined for private groups can leak. We can't convince those projects and communities that privacy is important and we're frankly outnumbered. We still recommend DMs or wall-to-wall posts for posting to groups because only these mechanisms can minimise leakage of private group content, and users shouldn't be forced to remember which is which. But this isn't the hill I wish to die on. A hidden config allows group owners to change this behaviour based on their own privacy and usability needs.
2021-04-07 17:27:50 -07:00
nobody
ee99f8f27f
issue commenting from search/display if you're the site admin
2021-04-06 19:49:44 -07:00
nobody
acb63fdcb8
property values showing up as unuseable attachments in posts/comments from hz
2021-04-06 16:20:10 -07:00
nobody
136066b971
federated alt text support for image attachments
2021-04-06 13:31:44 -07:00
nobody
6338fe995b
Merge branch 'dev' of /home/macgirvin/z into dev
2021-04-05 17:58:30 -07:00
nobody
f4b131a00a
issue displaying draft comments on stream page
2021-04-05 17:57:39 -07:00
nobody
886c7337df
Merge branch 'dev' of /home/macgirvin/z into dev
2021-04-01 17:04:24 -07:00
nobody
d24b9a9544
disable file activities until a few more things are fixed.
2021-04-01 15:21:19 -07:00
nobody
c1481e4a68
Merge branch 'dev' of /home/macgirvin/z into dev
2021-04-01 14:40:55 -07:00
nobody
4805473bd0
error parsing coordinates
2021-04-01 14:39:18 -07:00
nobody
a125379844
Merge branch 'dev' of /home/macgirvin/z into dev
2021-03-31 18:30:58 -07:00
nobody
34d7b074ae
more work on AP fetchable photo albums
2021-03-31 18:25:14 -07:00
nobody
a59c766d3a
Merge branch 'dev' of /home/macgirvin/z into dev
2021-03-29 17:52:59 -07:00
nobody
53191a92be
minor markdown fixes
2021-03-29 17:52:21 -07:00
nobody
831b71d7ed
Merge branch 'dev' of /home/macgirvin/z into dev
2021-03-29 17:27:51 -07:00
nobody
684f91f90a
add markdown documentation
2021-03-29 17:02:45 -07:00
nobody
f76bccb1ac
Merge branch 'dev' of /home/macgirvin/z into dev
2021-03-29 12:56:29 -07:00
nobody
c2ea3534bb
multicode: provide 'nomd' and 'nohtml' tags to be consistent with 'nobb'
2021-03-29 12:53:58 -07:00
nobody
94fa0cb111
Merge branch 'dev' of /home/macgirvin/z into dev
2021-03-27 14:54:38 -07:00
nobody
153ccca230
wip: dm links, possibly requires significant refactor of the acl_selector before all is said and done
2021-03-25 20:29:42 -07:00
nobody
e1ffaa8794
Merge branch 'dev' of /home/macgirvin/z into dev
2021-03-24 17:55:04 -07:00
nobody
f39efa8bb1
markdown in multicode: backslash escapes for a number of markdown constructs are supported but the backslash remained in the text afterward. Strip it.
2021-03-24 17:52:10 -07:00
nobody
124fd1addf
cleanup include/attach.php
2021-03-23 22:28:01 -07:00
nobody
866182aaaa
Merge branch 'dev' of /home/macgirvin/z into dev
2021-03-23 20:52:01 -07:00