diff options
| author | Tom Christie | 2015-02-06 14:35:06 +0000 |
|---|---|---|
| committer | Tom Christie | 2015-02-06 14:35:06 +0000 |
| commit | 3dff9a4fe2952cf632ca7f4cd9ecf4221059ca91 (patch) | |
| tree | 0649d42b20b875e97cb551b987644b61e7860e84 /docs/img | |
| parent | c06a82d0531f4cb290baacee196829c770913eaa (diff) | |
| parent | 1f996128458570a909d13f15c3d739fb12111984 (diff) | |
| download | django-rest-framework-3dff9a4fe2952cf632ca7f4cd9ecf4221059ca91.tar.bz2 | |
Resolve merge conflictmodel-serializer-caching
Diffstat (limited to 'docs/img')
| -rw-r--r-- | docs/img/cursor-pagination.png | bin | 0 -> 12221 bytes |
| -rw-r--r-- | docs/img/link-header-pagination.png | bin | 0 -> 35799 bytes |
| -rw-r--r-- | docs/img/pages-pagination.png | bin | 0 -> 10229 bytes |
| -rw-r--r-- | docs/img/sponsors/2-galileo_press.png | bin | 11451 -> 0 bytes |
| -rw-r--r-- | docs/img/sponsors/2-rheinwerk_verlag.png | bin | 0 -> 1562 bytes |
5 files changed, 0 insertions, 0 deletions
diff --git a/docs/img/cursor-pagination.png b/docs/img/cursor-pagination.png Binary files differnew file mode 100644 index 00000000..1c9c99b6 --- /dev/null +++ b/docs/img/cursor-pagination.png diff --git a/docs/img/link-header-pagination.png b/docs/img/link-header-pagination.png Binary files differnew file mode 100644 index 00000000..d3c556a4 --- /dev/null +++ b/docs/img/link-header-pagination.png diff --git a/docs/img/pages-pagination.png b/docs/img/pages-pagination.png Binary files differnew file mode 100644 index 00000000..4ce1a09a --- /dev/null +++ b/docs/img/pages-pagination.png diff --git a/docs/img/sponsors/2-galileo_press.png b/docs/img/sponsors/2-galileo_press.png Binary files differdeleted file mode 100644 index f77e6c0a..00000000 --- a/docs/img/sponsors/2-galileo_press.png +++ /dev/null diff --git a/docs/img/sponsors/2-rheinwerk_verlag.png b/docs/img/sponsors/2-rheinwerk_verlag.png Binary files differnew file mode 100644 index 00000000..ad454e17 --- /dev/null +++ b/docs/img/sponsors/2-rheinwerk_verlag.png |
