Bond_009
|
4a4dff1973
|
Fix
|
2020-08-09 14:08:56 +02:00 |
|
crobibero
|
e65ecb5687
|
Merge remote-tracking branch 'upstream/master' into api-merge-again
|
2020-08-04 20:29:06 -06:00 |
|
Bond_009
|
2b355c36ff
|
Minor improvements
OFC I reduced some allocations
|
2020-08-03 20:32:45 +02:00 |
|
crobibero
|
f915c3e5d9
|
Merge remote-tracking branch 'upstream/master' into api-migration
|
2020-08-03 11:24:13 -06:00 |
|
Nyanmisaka
|
c23d991c95
|
Merge branch 'master' into tonemap
|
2020-08-03 14:58:44 +08:00 |
|
Bond-009
|
b7421db5fe
|
Merge pull request #3578 from barronpm/displaypreferences-efcore
Migrate Display Preferences to EF Core
|
2020-08-01 21:51:49 +02:00 |
|
nyanmisaka
|
45a97056ea
|
allows to provide multiple fonts
|
2020-07-29 02:44:11 +08:00 |
|
Matt Montgomery
|
a40fe86776
|
Merge remote-tracking branch 'upstream/master' into quickconnect
|
2020-07-26 16:14:58 -05:00 |
|
nyanmisaka
|
7b862bba5a
|
add Tonemapping relaying on nvdec and ocl
|
2020-07-25 00:57:34 +08:00 |
|
nyanmisaka
|
c888b34a62
|
add a method to use custom fallback fonts for subtitle rendering
|
2020-07-24 21:19:56 +08:00 |
|
Patrick Barron
|
a59bc5c6a8
|
Fixed compilation error.
|
2020-07-23 20:57:59 -04:00 |
|
Patrick Barron
|
3d69cea1c9
|
Merge branch 'master' into displaypreferences-efcore
|
2020-07-23 23:50:12 +00:00 |
|
Pika
|
7331c02a21
|
Update MediaBrowser.Model/Entities/MediaStream.cs
Co-authored-by: Cody Robibero <cody@robibe.ro>
|
2020-07-23 19:22:56 -04:00 |
|
Pika
|
ea4aa5ed8e
|
Update MediaBrowser.Model/Entities/MediaStream.cs
Co-authored-by: Cody Robibero <cody@robibe.ro>
|
2020-07-23 19:13:19 -04:00 |
|
Pika
|
262daa6650
|
Update MediaBrowser.Model/Entities/MediaStream.cs
Co-authored-by: Cody Robibero <cody@robibe.ro>
|
2020-07-23 19:13:02 -04:00 |
|
Pika
|
f5a3408c89
|
Update MediaBrowser.Model/Entities/MediaStream.cs
Co-authored-by: Cody Robibero <cody@robibe.ro>
|
2020-07-23 19:12:52 -04:00 |
|
Pika
|
3b21abd879
|
Merge branch 'master' into more-track-titles
|
2020-07-23 18:59:25 -04:00 |
|
Bond-009
|
ab9c1295ce
|
Merge pull request #3538 from Ullmie02/api-fix
Fix value parsing in Jellyfin.Api
|
2020-07-23 10:37:30 +02:00 |
|
Bond-009
|
944fdb4c62
|
Merge pull request #3552 from BaronGreenback/NotificationFix
Fixes #3551 (Notifications Serialization error)
|
2020-07-23 10:34:32 +02:00 |
|
crobibero
|
1385064497
|
Merge remote-tracking branch 'upstream/master' into api-migration-merge
|
2020-07-20 14:28:33 -06:00 |
|
Patrick Barron
|
4742ddbb71
|
Update .NET Core to 3.1.6
|
2020-07-17 19:48:11 -04:00 |
|
Patrick Barron
|
ab396225ea
|
Migrate Display Preferences to EF Core
|
2020-07-17 16:11:53 -04:00 |
|
BaronGreenback
|
6b4cea604c
|
Suggested changes and removed some intellisense messages.
|
2020-07-17 16:19:06 +01:00 |
|
crobibero
|
2b5d515de7
|
specify plugin repo on install
|
2020-07-17 09:08:29 -06:00 |
|
David
|
262e19b691
|
Add X-Response-Time-ms header and log slow server response time
|
2020-07-14 13:40:18 +02:00 |
|
BaronGreenback
|
12478c7196
|
Update NotificationOption.cs
Fixes serialisation bug
|
2020-07-13 17:54:06 +01:00 |
|
dkanada
|
5e706ba7ce
|
keep playstate during syncplay group creation
|
2020-07-13 06:55:03 +09:00 |
|
David
|
ee03b919f9
|
Fix parsing
|
2020-07-12 20:11:59 +02:00 |
|
Joshua M. Boniface
|
f3151e7dc7
|
Merge pull request #3505 from Bond-009/minor3
Minor fixes
|
2020-07-05 00:30:35 -04:00 |
|
Bond_009
|
ae6eaa7f02
|
Minor fixes
|
2020-07-04 22:06:27 +02:00 |
|
Patrick Barron
|
6d1b00da64
|
Use Array.Empty
|
2020-07-04 11:54:25 -04:00 |
|
Bond-009
|
89ef8d79d6
|
Merge pull request #3465 from BaronGreenback/BugFix2
10.6.0.0 Null Pointer fix
|
2020-06-27 20:43:37 +02:00 |
|
BaronGreenback
|
2f4860741c
|
_config.Configuration.PluginRespositories not instantiated causing InstallationManager.cs to crash with a null pointer.
|
2020-06-27 15:41:57 +01:00 |
|
dkanada
|
9a44e2912e
|
Merge pull request #3455 from jellyfin/values
Use constructor to set optimal config values
|
2020-06-27 05:58:07 +09:00 |
|
dkanada
|
83ae4d074d
|
use constructor to set optimal config values
|
2020-06-27 00:22:27 +09:00 |
|
Cody Robibero
|
5f1b1dc3cc
|
fix nullability
|
2020-06-26 08:41:21 -06:00 |
|
Mark Monteiro
|
0e9164351b
|
Merge remote-tracking branch 'upstream/master' into external-id-type
|
2020-06-26 10:12:22 -04:00 |
|
dkanada
|
4e08876028
|
Merge pull request #3418 from Bond-009/minor3
Minor changes
|
2020-06-23 16:56:44 +09:00 |
|
Bond-009
|
3d42f37538
|
Minor changes
|
2020-06-22 15:35:53 +02:00 |
|
Bond-009
|
464066f362
|
Merge pull request #3411 from neilsb/system-plugin-removal
Prevent system plugins from being uninstalled
|
2020-06-22 15:23:35 +02:00 |
|
dkanada
|
552a358c9c
|
Merge pull request #3244 from jellyfin/custom-repos
Initial implementation for custom plugin repositories
|
2020-06-22 22:08:43 +09:00 |
|
Neil Burrows
|
c20400fa40
|
Prevent system plugins from being uninstalled
|
2020-06-22 10:13:28 +01:00 |
|
telans
|
5bb639a59a
|
newlines after braces
|
2020-06-20 21:13:48 +12:00 |
|
telans
|
7f307f9082
|
brace multiline if statements
|
2020-06-20 21:12:36 +12:00 |
|
telans
|
98db8f72e0
|
fix SA1503 for one line if statements
|
2020-06-20 20:35:29 +12:00 |
|
telans
|
8de6452967
|
fix some documentation periods
|
2020-06-20 18:13:11 +12:00 |
|
ConfusedPolarBear
|
e2f16fc255
|
Merge remote-tracking branch 'upstream/master' into quickconnect
|
2020-06-19 23:33:43 -05:00 |
|
ConfusedPolarBear
|
329980c727
|
API cleanup
|
2020-06-19 23:33:07 -05:00 |
|
ConfusedPolarBear
|
4be476ec53
|
Move all settings into the main server configuration
Decreased the timeout from 30 minutes to 5.
Public lookup values have been replaced with the short code.
|
2020-06-19 23:32:24 -05:00 |
|
crobibero
|
0651d7512b
|
Enable BlurHash for People
|
2020-06-16 15:12:48 -06:00 |
|
dkanada
|
f5d82441a4
|
Merge branch 'master' into custom-repos
|
2020-06-17 02:09:32 +09:00 |
|
Bond-009
|
9af6eda0b4
|
Merge pull request #3343 from telans/comment-stops
Add full stop at end of comments (SA1629)
|
2020-06-16 11:54:58 +02:00 |
|
telans
|
247f9c61e6
|
fix SA1513/SA1516
|
2020-06-16 16:11:30 +12:00 |
|
telans
|
9018f8d8be
|
Add full stop at end of comments (SA1629)
|
2020-06-16 10:37:52 +12:00 |
|
dkanada
|
dabb869a6b
|
Merge branch 'master' into hwaccel
|
2020-06-15 20:21:25 +09:00 |
|
telans
|
9b528aabc2
|
misc
|
2020-06-15 10:45:59 +12:00 |
|
telans
|
3d9049ef08
|
fix SA1508
|
2020-06-15 10:45:55 +12:00 |
|
telans
|
acd4389653
|
fix SA1005
|
2020-06-15 10:41:00 +12:00 |
|
Patrick Barron
|
42b4f0aa2e
|
Merge branch 'master' into userdb-efcore
# Conflicts:
# Emby.Server.Implementations/Library/UserManager.cs
# Jellyfin.Data/Jellyfin.Data.csproj
|
2020-06-13 19:41:05 -04:00 |
|
Patrick Barron
|
7a115024aa
|
Merge branch 'master' into userdb-efcore
# Conflicts:
# MediaBrowser.Controller/Library/ILibraryManager.cs
# MediaBrowser.Providers/Users/UserMetadataService.cs
|
2020-06-11 18:23:12 -04:00 |
|
crobibero
|
a6815018dc
|
Update to .NET Core 3.1.5
|
2020-06-11 07:13:56 -06:00 |
|
aled
|
299e49f39d
|
Fix a small number of compile warnings
|
2020-06-09 23:12:53 +01:00 |
|
ConfusedPolarBear
|
0d6a63bf84
|
Make all properties nullable
|
2020-06-08 15:48:18 -05:00 |
|
ConfusedPolarBear
|
35ff2be9d7
|
Merge remote-tracking branch 'upstream/master' into quickconnect
|
2020-06-08 14:43:58 -05:00 |
|
artiume
|
b79957d07e
|
Split HEVC VP9 10bit
|
2020-06-08 14:45:27 +03:00 |
|
Vasily
|
4999831604
|
Merge remote-tracking branch 'upstream/master' into hwaccel
|
2020-06-08 14:44:21 +03:00 |
|
dkanada
|
3f58bd7c58
|
disable nullable errors for new model
|
2020-06-07 21:26:50 +09:00 |
|
dkanada
|
52cd955a8f
|
merge branch master into custom-repos
|
2020-06-07 21:23:15 +09:00 |
|
aled
|
22a860a806
|
Fix a small number of compile warnings
|
2020-06-06 20:17:49 +01:00 |
|
dkanada
|
8ac2f1bb8b
|
simplify the custom repository feature for now
|
2020-06-06 22:02:30 +09:00 |
|
dkanada
|
d6184dbadd
|
remove unnecessary property for repository object
|
2020-06-06 18:57:00 +09:00 |
|
dkanada
|
6d4f3c42a2
|
Merge pull request #3208 from jellyfin/plugins
More work for core plugins
|
2020-06-06 12:27:45 +09:00 |
|
Patrick Barron
|
fa80f84f26
|
Merge branch 'userdb-efcore' of https://github.com/barronpm/jellyfin into userdb-efcore
|
2020-06-05 22:33:34 -04:00 |
|
crobibero
|
340624c54b
|
Move default repo addition to migration
|
2020-06-05 13:23:38 -06:00 |
|
Patrick Barron
|
06f9cde22f
|
Merge branch 'master' into userdb-efcore
# Conflicts:
# Emby.Server.Implementations/EntryPoints/ServerEventNotifier.cs
# Emby.Server.Implementations/Library/UserManager.cs
# Emby.Server.Implementations/Sorting/IsFavoriteOrLikeComparer.cs
# Emby.Server.Implementations/Sorting/IsPlayedComparer.cs
# Emby.Server.Implementations/Sorting/IsUnplayedComparer.cs
# Emby.Server.Implementations/TV/TVSeriesManager.cs
# Jellyfin.Server.Implementations/Users/DefaultAuthenticationProvider.cs
|
2020-06-04 16:52:23 -04:00 |
|
dkanada
|
b7f4b8e2b5
|
initial implementation for custom plugin repositories
|
2020-06-04 23:57:57 +09:00 |
|
dkanada
|
fe16c3fad4
|
Merge branch 'master' into install-plugin
|
2020-06-04 03:20:48 +09:00 |
|
Bond-009
|
2dbb9d4895
|
Fix build
|
2020-06-03 11:54:01 +02:00 |
|
Vasily
|
668e10ceb7
|
Merge pull request #2767 from Bond-009/nullable3
Enable nullabe reference types for MediaBrowser.Model
|
2020-06-03 12:26:54 +03:00 |
|
Vasily
|
959a9655c8
|
Update MediaBrowser.Model/Services/IHasRequestFilter.cs
Co-authored-by: Cody Robibero <cody@robibe.ro>
|
2020-06-03 12:26:40 +03:00 |
|
Anthony Lavado
|
c31b2798a5
|
Merge pull request #3180 from xumix/master
Refactor copy codec checks
|
2020-06-03 02:47:15 -04:00 |
|
Patrick Barron
|
bb828d54c5
|
Remove unused methods
|
2020-06-02 14:40:48 -04:00 |
|
Vasily
|
b9618c8c01
|
Merge pull request #2676 from GranPC/public-pr/blurhash
Implement Blurhash generation for images
|
2020-06-02 17:25:45 +03:00 |
|
dkanada
|
d72bb8358e
|
minor changes to server configuration file
|
2020-05-31 15:20:17 +09:00 |
|
ConfusedPolarBear
|
5d281adedd
|
Merge remote-tracking branch 'upstream/master' into quickconnect
|
2020-05-29 17:42:42 -05:00 |
|
Bond_009
|
7439e095e2
|
Merge branch 'master' into nullable3
|
2020-05-27 20:49:18 +02:00 |
|
ferferga
|
ba03ed65fe
|
Remove "download images in advance" option
|
2020-05-27 19:13:41 +02:00 |
|
Vasily
|
2482bcb3b1
|
Add blurhashes to ImageBlurHashes for all images
|
2020-05-27 16:27:27 +03:00 |
|
Patrick Barron
|
7c823464bc
|
Fix merge conflicts with SyncPlay
|
2020-05-26 20:52:05 -04:00 |
|
Patrick Barron
|
01ce56016a
|
Merge branch 'master' into userdb-efcore
# Conflicts:
# Emby.Server.Implementations/Library/UserManager.cs
# Jellyfin.Data/Jellyfin.Data.csproj
# MediaBrowser.Api/UserService.cs
# MediaBrowser.Controller/Library/IUserManager.cs
|
2020-05-26 20:29:11 -04:00 |
|
Joshua M. Boniface
|
7c72f69189
|
Merge pull request #2733 from OancaAndrei/syncplay
Add syncplay feature
|
2020-05-26 20:00:01 -04:00 |
|
Joshua M. Boniface
|
0be3dfe7c5
|
Revert "Fix emby/user/public API leaking sensitive data"
|
2020-05-26 12:14:40 -04:00 |
|
nyanmisaka
|
b4b93995f7
|
add more separate hw decoding toggles
|
2020-05-26 18:06:49 +03:00 |
|
gion
|
e4838b0faa
|
Merge remote-tracking branch 'upstream/master' into syncplay
|
2020-05-26 10:23:09 +02:00 |
|
Vasily
|
0f32b0ffad
|
Change image blurhash mapping to "image type to blurhash"
|
2020-05-26 01:04:40 +03:00 |
|
xumix
|
46420dfd68
|
Refactor copy codec checks
|
2020-05-26 00:58:19 +03:00 |
|
Vasily
|
279f0da980
|
Rename ImageInfo.Hash to ImageInfo.BlurHash
|
2020-05-26 00:52:13 +03:00 |
|
Vasily
|
29443e3681
|
Apply suggestions from code review
Co-authored-by: dkanada <dkanada@users.noreply.github.com>
|
2020-05-26 00:50:29 +03:00 |
|
dkanada
|
deafe59b7e
|
add the timestamp property back to the version info
|
2020-05-24 16:59:05 +09:00 |
|
dkanada
|
7972daaba4
|
fix a few issues with the plugin manifest
|
2020-05-24 15:40:27 +09:00 |
|
Mark Monteiro
|
4f6e5591ec
|
Remove 'General' as an ExternalIdMediaType, and instead use 'null' to represent a general external id type
|
2020-05-23 16:08:51 -04:00 |
|
Mark Monteiro
|
07897ec7af
|
Specify enum values for ExternalIdMediaType explicitly
|
2020-05-23 15:49:02 -04:00 |
|
Vasily
|
1f83a21288
|
Rename Hash to BlurHash in all properties and methods for clarity
|
2020-05-21 01:43:19 +03:00 |
|
artiume
|
ae4c407b6d
|
Add .edl Mimetype
|
2020-05-20 16:46:33 -04:00 |
|
Patrick Barron
|
c464f700db
|
Remove redundant qualifiers
|
2020-05-20 13:07:53 -04:00 |
|
Patrick Barron
|
7d9d54d2ec
|
Fix profile images.
|
2020-05-20 12:09:52 -04:00 |
|
Patrick Barron
|
3eeb6576d8
|
Migrate User DB to EF Core
|
2020-05-20 10:04:00 -04:00 |
|
Jesús Higueras
|
b9fc0d2628
|
Add BlurHash support to backend
|
2020-05-18 23:21:37 +03:00 |
|
Mark Monteiro
|
d06fee75b6
|
Rename Name to ProviderName
|
2020-05-17 17:36:36 -04:00 |
|
Mark Monteiro
|
c82f7eeca1
|
Clean up some doc comments
|
2020-05-17 17:26:40 -04:00 |
|
Mark Monteiro
|
67edf1b7f5
|
Do not convert 'Type' value to string unnecessarily, and do not replace 'General' type with null
|
2020-05-17 15:59:13 -04:00 |
|
Mark Monteiro
|
422d5b2b68
|
Move ExternalIdMediaType enum to MediaBrowser.Model
|
2020-05-17 15:57:24 -04:00 |
|
Mark Monteiro
|
526e47c362
|
Clean up documentation
|
2020-05-17 15:27:43 -04:00 |
|
Mark Monteiro
|
96acd6481e
|
Merge branch 'master' into externalid-type
|
2020-05-17 13:50:44 -04:00 |
|
Mark Monteiro
|
3ed76d7e08
|
Update to .NET Core 3.1.4
|
2020-05-17 13:33:38 -04:00 |
|
dkanada
|
4b4b50f3ee
|
Merge pull request #3115 from MrTimscampi/ffprobe
Parse color transfer and color primaries from ffprobe, and fix video range
|
2020-05-18 00:06:07 +09:00 |
|
MrTimscampi
|
9314434bbf
|
Fix suggestions
|
2020-05-16 17:35:34 +02:00 |
|
dkanada
|
8921c7a5bf
|
Merge pull request #3113 from Artiume/patch-1
Fix Progressive and Interlaced Stream capitalization
|
2020-05-16 21:56:25 +09:00 |
|
dkanada
|
ddebc9301e
|
Merge pull request #3116 from Artiume/patch-2
Update Books Resolver File Types and add .opf Mime Type
|
2020-05-16 16:01:59 +09:00 |
|
Patrick Barron
|
aca7e221d8
|
Merge branch 'master' into userdb-efcore
# Conflicts:
# Emby.Server.Implementations/Activity/ActivityLogEntryPoint.cs
# Emby.Server.Implementations/ApplicationHost.cs
# Emby.Server.Implementations/Devices/DeviceManager.cs
# Jellyfin.Server/Jellyfin.Server.csproj
# Jellyfin.Server/Migrations/MigrationRunner.cs
# MediaBrowser.Controller/Devices/IDeviceManager.cs
|
2020-05-15 17:20:07 -04:00 |
|
gion
|
029bb80910
|
Merge remote-tracking branch 'upstream/master' into syncplay
|
2020-05-15 18:59:35 +02:00 |
|
artiume
|
a765272c17
|
Update MimeTypes.cs
|
2020-05-15 09:38:26 -04:00 |
|
artiume
|
527029af92
|
Update MediaStream.cs
|
2020-05-15 09:36:30 -04:00 |
|
artiume
|
d41cdb3b7a
|
Update Interlace
|
2020-05-15 09:36:30 -04:00 |
|
artiume
|
eb3ce3fb87
|
Fix Progressive Stream 'P' capitalization
|
2020-05-15 09:36:30 -04:00 |
|
artiume
|
9ed8c6cb11
|
Add opf mimetype
|
2020-05-15 07:59:46 -04:00 |
|
Patrick Barron
|
87c63e668c
|
Merge branch 'master' into activitydb-efcore
|
2020-05-14 21:16:43 +00:00 |
|
Patrick Barron
|
b94afc597c
|
Address review comments
|
2020-05-14 17:13:45 -04:00 |
|
MrTimscampi
|
234292453f
|
Add HLG to the video range detection
|
2020-05-14 18:44:51 +02:00 |
|
Mark Monteiro
|
2e09311a93
|
Merge branch 'master' into websocket
|
2020-05-14 11:08:08 -04:00 |
|
Patrick Barron
|
a8f0d0aa0d
|
Merge branch 'master' into activitydb-efcore
|
2020-05-13 19:06:04 +00:00 |
|
Patrick Barron
|
c1360a1dc3
|
Merge branch 'master' into userdb-efcore
# Conflicts:
# Emby.Server.Implementations/Data/SqliteUserDataRepository.cs
# Emby.Server.Implementations/Library/UserManager.cs
# Jellyfin.Data/Entities/User.cs
# Jellyfin.Data/ISavingChanges.cs
# Jellyfin.Server.Implementations/Jellyfin.Server.Implementations.csproj
# Jellyfin.Server.Implementations/JellyfinDb.cs
# Jellyfin.Server/Migrations/MigrationRunner.cs
# MediaBrowser.Model/Notifications/NotificationOptions.cs
# MediaBrowser.sln
|
2020-05-12 22:22:20 -04:00 |
|
Patrick Barron
|
9ad839c776
|
Initial migration code
|
2020-05-12 22:10:35 -04:00 |
|
Patrick Barron
|
6379391f87
|
Merge branch 'master' into activitydb-efcore
|
2020-05-12 16:08:28 +00:00 |
|
Mark Monteiro
|
dc5165b97f
|
Merge branch 'master' into simplify-https-config
|
2020-05-10 14:43:57 -04:00 |
|
gion
|
5c8cbd4087
|
Fix code issues
|
2020-05-09 14:34:07 +02:00 |
|
gion
|
8a6ec2fb71
|
Rename Syncplay to SyncPlay
|
2020-05-09 12:37:39 +02:00 |
|
gion
|
6e22e9222b
|
Fix code issues
|
2020-05-09 12:37:23 +02:00 |
|
artiume
|
3e14b1b50f
|
Remove ogg video mimetype
|
2020-05-07 15:58:20 -04:00 |
|
Bond-009
|
62da4d0e5c
|
Merge pull request #2492 from Polpetta/fix-api-private-data-leak
Fix emby/user/public API leaking sensitive data
|
2020-05-07 14:52:10 +02:00 |
|
Davide Polonio
|
5c6339d8fd
|
Fix typo in PublicUserDto
Co-authored-by: Vasily <JustAMan@users.noreply.github.com>
|
2020-05-07 09:14:00 +02:00 |
|
Davide Polonio
|
57cf19f058
|
Fix variable declaration and follow sonarcloud suggestions
|
2020-05-06 17:25:41 +02:00 |
|
dkanada
|
cd07bc23f8
|
Merge pull request #3050 from Artiume/patch-1
Update MimeTypes.cs
|
2020-05-06 21:56:45 +09:00 |
|
artiume
|
1388464329
|
Update MimeTypes.cs
|
2020-05-06 08:23:56 -04:00 |
|
artiume
|
1058c80a41
|
Update MediaBrowser.Model/Net/MimeTypes.cs
|
2020-05-06 07:45:40 -04:00 |
|
artiume
|
0aff46631f
|
Update MediaBrowser.Model/Net/MimeTypes.cs
Co-authored-by: dkanada <dkanada@users.noreply.github.com>
|
2020-05-06 07:38:19 -04:00 |
|
Mark Monteiro
|
432aae0fcc
|
Add missing comma
|
2020-05-05 11:17:03 -04:00 |
|
artiume
|
183514ebe2
|
add azw3
|
2020-05-05 07:25:32 -04:00 |
|
artiume
|
25651362bf
|
Update MimeTypes.cs
|
2020-05-04 12:13:50 -04:00 |
|
artiume
|
675cbd8a16
|
Update MimeTypes.cs
|
2020-05-03 18:23:25 -04:00 |
|