Tom Christie
|
42fcc3599c
|
Added @brutasse for docs fix #600. Thanks!
|
2013-01-20 15:50:16 +00:00 |
|
Tom Christie
|
199fa766ff
|
Update release notes
|
2013-01-19 17:00:20 +00:00 |
|
Tom Christie
|
4b61ead53f
|
Added @nemesisdesign, for documentation on Apache mod_wsgi setup. Thanks!
Refs #588.
|
2013-01-18 22:30:03 +00:00 |
|
Tom Christie
|
0672401781
|
Update release notes.
|
2013-01-18 22:00:59 +00:00 |
|
Tom Christie
|
0f0a07b732
|
Note changes to Decimal rendering to json behavior. Fixes #582.
|
2013-01-16 14:41:57 +00:00 |
|
Tom Christie
|
fecfe57aef
|
Updated release notes.
|
2013-01-16 14:36:37 +00:00 |
|
Tom Christie
|
0756ca1f42
|
Added @steve-gregory for nullable slug relation tests.
See: #585
|
2013-01-16 14:35:30 +00:00 |
|
Tom Christie
|
e1076cfb49
|
Added @radiosilence, for the timedelta encoding support. Thanks!
See: #584
|
2013-01-15 13:31:05 +00:00 |
|
Tom Christie
|
b4c43d5fe4
|
Update release notes
|
2013-01-15 13:29:21 +00:00 |
|
Stephan Groß
|
e32aaa29b8
|
Add @shezi thanks!
|
2013-01-15 14:00:32 +01:00 |
|
Tom Christie
|
191135d7b0
|
Version 2.1.16
|
2013-01-14 09:20:44 +00:00 |
|
Tom Christie
|
25a463be73
|
Update release notes.
|
2013-01-12 10:07:11 +00:00 |
|
Tom Christie
|
c09a579851
|
Added @wackerbarth. Thanks!
|
2013-01-11 08:57:06 +00:00 |
|
Mark Aaron Shirley
|
b298bf53f3
|
Update release notes
|
2013-01-08 08:35:41 -08:00 |
|
Tom Christie
|
de00d3720e
|
Added @mjtamlyn. Thanks!
|
2013-01-07 17:36:31 +00:00 |
|
Tom Christie
|
152e6d5c0a
|
Added @michaelmior. Thanks!
|
2013-01-07 08:57:43 +00:00 |
|
Yuri Prezument
|
12bb25b372
|
Added @juanriaza. Thanks
|
2013-01-05 18:02:26 +02:00 |
|
Yuri Prezument
|
d7f3c86ad1
|
Updated release notes
|
2013-01-05 18:01:57 +02:00 |
|
Tom Christie
|
26f9acb45a
|
Validation errors instead of exceptions when serializers receive incorrect types. Fixes #402.
|
2013-01-04 14:11:05 +00:00 |
|
Tom Christie
|
eb14278a3b
|
Add proper validation for updating relational fields with incorrect types. Fixes #446.
|
2013-01-04 13:50:40 +00:00 |
|
Mark Shirley
|
466d4584ae
|
Remove duplicate release notes line
|
2013-01-03 23:18:58 +01:00 |
|
Tom Christie
|
ad671022e1
|
Version 2.1.15
|
2013-01-03 22:14:11 +00:00 |
|
Tom Christie
|
4223786ddc
|
Tweak release notes.
|
2013-01-03 22:11:50 +00:00 |
|
Tom Christie
|
a122856d46
|
Tweak behavior of hyperlinked fields with an explicit format suffix.
|
2013-01-03 21:50:28 +00:00 |
|
Tom Christie
|
bfea7f64ee
|
Tweak behavior of hyperlinked fields that include an explicit format suffix.
|
2013-01-03 21:49:29 +00:00 |
|
Tom Christie
|
92ae08207a
|
Drop unused private save_m2m flag
|
2013-01-03 21:49:01 +00:00 |
|
Yuri Prezument
|
097f4c6962
|
Updated release-notes
|
2013-01-03 09:40:49 +02:00 |
|
Tom Christie
|
161432d78c
|
Added @ahankinson, for PATCH support. Thanks!
|
2013-01-02 13:49:43 +00:00 |
|
Tom Christie
|
ef73160599
|
Added RetrieveUpdateAPIView
|
2013-01-02 13:46:19 +00:00 |
|
Mark Aaron Shirley
|
f62acf025e
|
Update release notes
|
2013-01-01 18:06:22 +01:00 |
|
Tom Christie
|
eff833b39d
|
Version 2.1.14
|
2012-12-31 08:53:49 +00:00 |
|
Tom Christie
|
af5c3c3bf4
|
Added @sebastibe. Thanks!
|
2012-12-30 07:51:07 +00:00 |
|
Tom Christie
|
275fcde5e6
|
Added @toranb - Thank you!
|
2012-12-29 16:59:01 +00:00 |
|
Tom Christie
|
3c7a636199
|
Updated release notes
|
2012-12-29 16:58:51 +00:00 |
|
Tom Christie
|
25398e8cf1
|
Update release notes
|
2012-12-29 13:33:03 +00:00 |
|
Tom Christie
|
923f81d269
|
Nested serializers now support nullable relationships, plus test. Fixes #384
|
2012-12-29 13:19:05 +00:00 |
|
Tom Christie
|
3e4242fc43
|
django.contrib.staticfiles no longer needs to be in INSTALLED_APPS
|
2012-12-28 12:33:24 +00:00 |
|
Tom Christie
|
4b32cda5a8
|
Update release notes and documentation for 2.2.0
|
2012-12-27 17:53:07 +00:00 |
|
Tom Christie
|
9cc56a97b5
|
Added @akinfold for staticfiles changes.
|
2012-12-27 17:35:21 +00:00 |
|
Tom Christie
|
ed09d26fb8
|
Update docs/topics/release-notes.md
|
2012-12-23 18:50:17 +00:00 |
|
Tom Christie
|
79aea2f0d0
|
Version 2.1.12
|
2012-12-21 09:18:35 +00:00 |
|
Tom Christie
|
fb4bbf7d98
|
Added @treyhunner. Thank you!
|
2012-12-21 09:17:33 +00:00 |
|
Tom Christie
|
c097bcef58
|
Update release notes.
|
2012-12-19 22:42:11 +00:00 |
|
Tom Christie
|
566b9ff27b
|
Added @joual - Thanks!
|
2012-12-19 22:41:00 +00:00 |
|
Tom Christie
|
c29b08ad43
|
Update release notes
|
2012-12-19 22:06:38 +00:00 |
|
Tom Christie
|
24581faceb
|
Update release notes.
|
2012-12-18 18:23:28 +00:00 |
|
Tom Christie
|
9680b42b50
|
Version 2.1.11
|
2012-12-17 22:01:17 +00:00 |
|
Tom Christie
|
0418cebc58
|
Update contact details
|
2012-12-17 22:00:25 +00:00 |
|
Tom Christie
|
70714c2346
|
Version 2.1.10
|
2012-12-17 09:08:28 +00:00 |
|
Tom Christie
|
35f72cecb1
|
Fix model validation exclusions. Fixes #500. Fixes #506.
|
2012-12-15 20:40:41 +00:00 |
|
Tom Christie
|
1d24d1fc59
|
Added @sunscrapers. Thanks!
|
2012-12-14 20:14:42 +00:00 |
|
Tom Christie
|
e9eb47207a
|
Update release notes.
|
2012-12-14 20:08:53 +00:00 |
|
Tom Christie
|
6f8b432677
|
Added @pilt. Thanks!
|
2012-12-14 20:08:43 +00:00 |
|
Stephan Groß
|
e198a2b376
|
added RetrieveUpdateAPIView
|
2012-12-13 16:57:17 +01:00 |
|
Stephan Groß
|
628e3bf001
|
Added @cmurtaugh. Thanks!
|
2012-12-12 08:59:19 +01:00 |
|
Tom Christie
|
0824761f47
|
Version 2.1.9
|
2012-12-11 21:07:48 +00:00 |
|
Tom Christie
|
17b77fc446
|
Added @gkrappel. Thank you!
|
2012-12-11 21:07:11 +00:00 |
|
Tom Christie
|
80adaecc43
|
Added @annacoder. Thanks!
|
2012-12-11 09:04:47 +00:00 |
|
Tom Christie
|
ff01ae3571
|
Version 2.1.8
|
2012-12-08 13:01:03 +00:00 |
|
Tom Christie
|
c1be29418b
|
Add link to json+hal hypermedia format.
|
2012-12-07 23:58:20 +00:00 |
|
Tom Christie
|
b170973993
|
Version 2.1.7
|
2012-12-07 22:36:30 +00:00 |
|
Tom Christie
|
21f7dcf7c6
|
Added release notes
|
2012-12-07 22:25:28 +00:00 |
|
Tom Christie
|
a463ddbb37
|
Merge pull request #470 from minddust/fix-#469
fixed #469 - RegexField <--> BrowsableAPI Bug
|
2012-12-06 14:58:18 -08:00 |
|
Tom Christie
|
26cfa02326
|
Added @roberts81. Thanks!
|
2012-12-06 22:56:23 +00:00 |
|
Tom Christie
|
6a5f4f2a90
|
Added @justanotherbody. Thanks!
|
2012-12-06 22:38:20 +00:00 |
|
Tom Christie
|
2938bc13b1
|
Added @reinout for the copy fixes. Thanks!
|
2012-12-06 16:30:22 -04:00 |
|
Stephan Groß
|
e044fa089b
|
fixed #469 - RegexField <--> BrowsableAPI Bug
|
2012-12-04 09:40:23 +01:00 |
|
Stephan Groß
|
3e3ede71d2
|
Added @mvdwaeter. Thanks!
|
2012-12-03 12:47:12 +01:00 |
|
Tom Christie
|
45d28f49e0
|
Added @mhsparks. Thanks!
|
2012-12-02 11:04:34 -04:00 |
|
Tom Christie
|
8d485da483
|
Added @fabianbuechler. Thanks!
|
2012-11-29 19:05:34 -04:00 |
|
Stephan Groß
|
11ef60b127
|
Added @yprez Thanks!
|
2012-11-28 07:32:12 +01:00 |
|
Stephan Groß
|
24baf6425b
|
Added @oaubert Thanks!
|
2012-11-27 18:33:56 +01:00 |
|
Tom Christie
|
fd89bca35f
|
Version 2.1.6. AKA: I am a doofus.
|
2012-11-23 13:21:18 +00:00 |
|
Tom Christie
|
95aa99d8df
|
Version 2.1.5
|
2012-11-23 13:09:14 +00:00 |
|
Tom Christie
|
ac84c2ed2e
|
Version 2.1.4
|
2012-11-22 17:49:53 +00:00 |
|
Tom Christie
|
db3dc79288
|
Added @maspwr for the partial updates work. Ta!
|
2012-11-22 10:16:47 +00:00 |
|
Tom Christie
|
4eaac26427
|
Added @dbachrach. Thanks!
|
2012-11-22 10:12:22 +00:00 |
|
Tom Christie
|
df545f7a25
|
Updated release notes.
|
2012-11-22 10:08:14 +00:00 |
|
Tom Christie
|
d031ccce6e
|
Updated release notes.
|
2012-11-22 10:07:42 +00:00 |
|
Stephan Groß
|
6ba4df8a27
|
Merge remote-tracking branch 'upstream/master' into regex_field
Conflicts:
docs/topics/release-notes.md
|
2012-11-21 11:56:34 +01:00 |
|
Tom Christie
|
3268c67343
|
Update docs/topics/release-notes.md
|
2012-11-20 23:33:56 +00:00 |
|
Tom Christie
|
3227a357ce
|
Added @irrelative for the mighty fine work.
|
2012-11-20 23:19:11 +00:00 |
|
Stephan Groß
|
86484668f6
|
added RegexField
|
2012-11-20 15:38:50 +01:00 |
|
Tom Christie
|
588e4dda6d
|
Added release notes
|
2012-11-19 21:49:07 +00:00 |
|
Tom Christie
|
83f3770af1
|
Adding folks to the credits makes me happy. Good work @jonlil!
|
2012-11-19 21:47:34 +00:00 |
|
Tom Christie
|
ce5b186ca8
|
Docs tweaks.
|
2012-11-19 21:42:33 +00:00 |
|
Robert Romano
|
f5f1ac49ec
|
Update robromano fork with upstream master
Conflicts:
docs/topics/credits.md
docs/topics/release-notes.md
|
2012-11-18 21:07:44 -08:00 |
|
Tom Christie
|
346a79b170
|
Added @MechanisM - Thanks!
(That's a mighty kick ass Gravatar)
|
2012-11-17 00:29:15 +00:00 |
|
Tom Christie
|
016ef5019f
|
Version 2.1.3
|
2012-11-16 22:58:22 +00:00 |
|
Tom Christie
|
19b0516bfe
|
Getting 2.1.3 release notes ready
|
2012-11-16 22:49:28 +00:00 |
|
Tom Christie
|
31f01bd631
|
Polishing to page size query parameters & more docs
|
2012-11-16 22:45:57 +00:00 |
|
Tom Christie
|
9973cf329a
|
Merge pull request #412 from minddust/custom_page_size_per_request
support for custom page size per request
|
2012-11-16 13:45:27 -08:00 |
|
Stephan Groß
|
3ae203a018
|
updated script to just use page_size_kwarg
|
2012-11-15 12:06:43 +01:00 |
|
Stephan Groß
|
b17a981800
|
updated release noted for page_size stuff
|
2012-11-15 11:24:17 +01:00 |
|
Rob Romano
|
d541e0c423
|
Merge branch 'master' of https://github.com/robromano/django-rest-framework
Conflicts:
docs/api-guide/authentication.md
docs/topics/credits.md
|
2012-11-14 13:01:43 -08:00 |
|
Rob Romano
|
321ba156ca
|
Renamed AuthTokenView to ObtainAuthToken, added obtain_auth_token var, updated tests & docs. Left authtoken.urls in place as example.
|
2012-11-14 12:51:00 -08:00 |
|
Stephan Groß
|
33fe0d2bea
|
added release note
|
2012-11-14 16:08:14 +01:00 |
|
Ludwig Kraatz
|
8b999c6bb5
|
polishing code
and adding myself to auhtors file
|
2012-11-14 11:46:16 +01:00 |
|
Rob Romano
|
4fd590f96f
|
Renamed AuthTokenView to ObtainAuthToken, added obtain_auth_token var, updated tests & docs. Left authtoken.urls in place as example.
|
2012-11-13 16:49:13 -08:00 |
|
Tom Christie
|
f9a9ff1db0
|
Newline
|
2012-11-10 17:04:31 +00:00 |
|
Tom Christie
|
ffb4fe66ce
|
Added @glic3rinu. Thanks!
|
2012-11-10 17:03:08 +00:00 |
|
Tom Christie
|
e224061189
|
Support for read_only_fields on ModelSerializer classes
|
2012-11-09 17:01:20 +00:00 |
|
Tom Christie
|
3ac26af7ca
|
Version 2.1.2 (Adds filtering support)
|
2012-11-09 13:13:41 +00:00 |
|
Tom Christie
|
c7df9694b5
|
Merge pull request #383 from tomchristie/filtering
Support for filtering backends
|
2012-11-09 05:07:34 -08:00 |
|
Tom Christie
|
ad9c5d2ffa
|
Added @benkonrath, for his excellent work on filtering support. Thank you!
|
2012-11-08 21:49:38 +00:00 |
|
Tom Christie
|
f5ce7152ec
|
Tweak note style
|
2012-11-08 15:59:22 +00:00 |
|
Tomi Pajunen
|
40c6fe7119
|
Comments updated
|
2012-11-08 17:04:29 +02:00 |
|
Tomi Pajunen
|
b607eefc7c
|
Release notes updated
|
2012-11-08 16:48:16 +02:00 |
|
Tom Christie
|
0356c5dca4
|
Update release notes
|
2012-11-07 11:34:31 +00:00 |
|
Stephan Groß
|
62fc5b80ef
|
fixed field name
|
2012-11-06 20:54:48 +01:00 |
|
Stephan Groß
|
1f67b9ba9c
|
added changelog entry and fixed old one
|
2012-11-06 20:53:09 +01:00 |
|
Tom Christie
|
12b86cb5e3
|
Update release notes
|
2012-11-06 17:05:15 +00:00 |
|
Tom Christie
|
4f5a6fca64
|
Added @tonimichel. Thanks!
|
2012-11-06 11:04:27 +00:00 |
|
Tom Christie
|
9746abdf72
|
Version 2.1.0. Adding release notes.
|
2012-11-05 16:46:33 +00:00 |
|
Tom Christie
|
b87f01aa54
|
Merge pull request #371 from tomchristie/serializer-fixes
Serializer fixes
|
2012-11-05 08:35:54 -08:00 |
|
Tom Christie
|
33217db33e
|
Fix broken link
|
2012-11-05 15:39:03 +00:00 |
|
Tom Christie
|
558b29e5ff
|
Added @mjs7231 - Thanks!
|
2012-11-05 15:38:22 +00:00 |
|
Tom Christie
|
33be4b43b9
|
queryset argument is now optional on writable model fields.
|
2012-11-05 12:51:04 +00:00 |
|
Tom Christie
|
b7b942c599
|
Swap position of instance and data keyword arguments.
|
2012-11-05 10:53:20 +00:00 |
|
Tom Christie
|
362c413f08
|
Update release notes.
|
2012-11-05 09:59:35 +00:00 |
|
Tom Christie
|
a4ab4355a6
|
Added @osiloke. Thanks!
|
2012-11-05 09:59:35 +00:00 |
|
Tom Christie
|
3e0319389a
|
Added @jmagnusson. Thanks!
|
2012-11-04 09:45:30 +00:00 |
|
Tom Christie
|
59c1e0933f
|
Update release notes
|
2012-11-02 21:13:29 +00:00 |
|
Tom Christie
|
b9bff2a984
|
Fix issues with pk related fields in the browsable API.
|
2012-11-02 14:05:14 +00:00 |
|
Tom Christie
|
062f5caef3
|
Tweaks fields docs, and fix 2.0.1 version.
|
2012-11-01 23:40:34 +00:00 |
|
Tom Christie
|
09d70958bd
|
Update release notes
|
2012-11-01 23:15:42 +00:00 |
|
Tom Christie
|
600289a815
|
Added @ottoyiu. Thanks!
|
2012-11-01 13:31:22 +00:00 |
|
Tom Christie
|
027c9079f6
|
PUT as create should return 201. Fixes #340.
|
2012-10-31 20:11:38 +00:00 |
|
Tom Christie
|
ecc55ca8f4
|
Added @asfaltboy. Thanks!
|
2012-10-31 09:39:32 +00:00 |
|
Tom Christie
|
4cdd0b845e
|
Final docs tweaks for 2.0
|
2012-10-30 13:59:31 +00:00 |
|
Tom Christie
|
41ab18b13e
|
Docs update
|
2012-10-30 12:23:17 +00:00 |
|
Tom Christie
|
5f0d4ef2fc
|
Update browser enhancments docs. Fixes #339.
|
2012-10-30 10:30:51 +00:00 |
|
Tom Christie
|
cf77fd6964
|
Tweak
|
2012-10-29 09:10:14 +00:00 |
|
Tom Christie
|
076ca51d6f
|
Added @minddust. Thanks!
|
2012-10-29 08:53:12 +00:00 |
|
Tom Christie
|
0c71b4c100
|
Tweaks
|
2012-10-28 21:16:04 +00:00 |
|
Tom Christie
|
51a6401926
|
Added @madisvain. Thanks!
|
2012-10-27 18:47:17 +01:00 |
|
Tom Christie
|
cef379db06
|
2.0 Announcement
|
2012-10-27 18:39:17 +01:00 |
|
Tom Christie
|
0aed70dc8b
|
Added @diviei - Thanks!
|
2012-10-24 20:50:45 +02:00 |
|
Marko Tibold
|
71a93930fd
|
Fixing spelling errors.
|
2012-10-21 16:34:07 +02:00 |
|
Tom Christie
|
6717d654d0
|
Added @rdobson. Thanks!
|
2012-10-17 21:57:34 +01:00 |
|
Tom Christie
|
b5daa40852
|
Docs tweaks
|
2012-10-17 13:51:22 +01:00 |
|
Tom Christie
|
75ebf895ac
|
Added @eofs. Thanks!
|
2012-10-17 13:51:22 +01:00 |
|
Tom Christie
|
9c1fba3483
|
Tweak parsers to take parser_context
|
2012-10-15 13:27:50 +01:00 |
|
Tom Christie
|
7a89d7a770
|
Work on docs
|
2012-10-14 20:46:38 +01:00 |
|
Tom Christie
|
b3477b3b6c
|
Docs tweaks
|
2012-10-13 15:34:38 +01:00 |
|
Tom Christie
|
7608cf1193
|
Improve documentation for Requests
|
2012-10-13 15:07:43 +01:00 |
|
Tom Christie
|
52a2ff8f77
|
Docs tweaks
|
2012-10-09 16:44:49 +01:00 |
|
Tom Christie
|
65f592866c
|
Fix issue where required fields were not being properly validated. Also make model fields with a default value be not required
|
2012-10-08 17:53:18 +01:00 |
|
Tom Christie
|
4fd8ab17a3
|
Merge branch 'restframework2' of https://github.com/tomchristie/django-rest-framework into restframework2
|
2012-10-08 12:18:43 +01:00 |
|
Tom Christie
|
f4d4d54e03
|
Adding migration and changelog docs
|
2012-10-08 12:17:43 +01:00 |
|
Tom Christie
|
321d4d030a
|
Added @mattbo, @maximilianhurl. Thanks!
|
2012-10-07 21:30:06 +02:00 |
|
Tom Christie
|
e7685f3eb5
|
URL overrides in settings fixed up slightly
|
2012-10-02 15:24:42 +01:00 |
|
Tom Christie
|
aeeb68f68a
|
Added @j4mie, and added projects to 'additional thanks' as appropriate.
|
2012-09-28 10:42:14 +01:00 |
|
Tom Christie
|
8582b18ac4
|
Added @cyberj. Thanks!
|
2012-09-27 14:29:14 +02:00 |
|
Tom Christie
|
89a0b22306
|
Merge branch 'restframework2' of https://github.com/tomchristie/django-rest-framework into restframework2
|
2012-09-27 13:06:34 +01:00 |
|
Tom Christie
|
061cffb67b
|
Added citation to contributing docs
|
2012-09-27 12:49:08 +01:00 |
|
Tom Christie
|
da1f6df4fa
|
Added @LaundroMat. Thanks!
|
2012-09-26 23:07:59 +02:00 |
|
Tom Christie
|
4b691c4027
|
Change package name: djangorestframework -> rest_framework
|
2012-09-20 13:06:27 +01:00 |
|
Tom Christie
|
db13401af0
|
Added @phobologic. Thanks\!
|
2012-09-19 17:06:43 +01:00 |
|
Tom Christie
|
308677037f
|
Tweak docs, fix .error_data -> .errors
|
2012-09-17 20:19:45 +01:00 |
|
Tom Christie
|
a96211d3d1
|
Simplify negotiation. Drop MSIE hacks. Etc.
|
2012-09-16 21:48:55 +01:00 |
|
Tom Christie
|
f204439fa8
|
Merge branch 'browsable-bootstrap' of https://github.com/droptype/django-rest-framework into droptype-browsable-bootstrap
|
2012-09-14 12:52:12 +01:00 |
|
Tom Christie
|
eb761be9d0
|
Flesh out resources/routers part of tutorial
|
2012-09-14 12:43:14 +01:00 |
|
Alec Perkins
|
4cbc53a75d
|
Whoops, forgot to explain these.
|
2012-09-09 17:27:24 -04:00 |
|
Alec Perkins
|
9684b3fe22
|
Reference-style links. Much cleaner.
|
2012-09-09 17:07:54 -04:00 |
|
Alec Perkins
|
60e6bba12b
|
Browsable API doc topic
|
2012-09-09 17:02:19 -04:00 |
|
Tom Christie
|
382b277dfc
|
Link to github accounts in credits
|
2012-09-08 08:41:31 +01:00 |
|
Tom Christie
|
79144919f6
|
Added @alecperkins.
|
2012-09-08 08:38:14 +01:00 |
|
Tom Christie
|
215de9af81
|
Tidy up
|
2012-09-07 10:17:47 +01:00 |
|
Tom Christie
|
ef5279e97c
|
Improve docs
|
2012-09-05 13:03:55 +01:00 |
|
Tom Christie
|
c191a46ef0
|
Update credits
|
2012-09-03 12:19:16 +01:00 |
|
Tom Christie
|
73d337ea5d
|
Fix credits doc
|
2012-09-01 23:14:48 +01:00 |
|
Tom Christie
|
9941556474
|
Get docs ready to deploy
|
2012-09-01 21:23:50 +01:00 |
|
Tom Christie
|
deedf6957d
|
REST framework 2 docs
|
2012-09-01 20:26:27 +01:00 |
|