diff options
| author | LUXEY Adrien <adrien.luxey@inria.fr> | 2020-10-13 13:00:39 +0200 |
|---|---|---|
| committer | LUXEY Adrien <adrien.luxey@inria.fr> | 2020-10-13 13:00:39 +0200 |
| commit | b623edf7520174219db33f2f045fbe6ed7558aa0 (patch) | |
| tree | 6f8c341e95a8d4071302fc9ab46ea7b9c4d14ada /images | |
| parent | a2ec1011bd728b4560ccc6ade93ac04836259028 (diff) | |
| parent | 5e9b6111ee012d3f659cda71afceffbd5142c4c2 (diff) | |
| download | design-b623edf7520174219db33f2f045fbe6ed7558aa0.tar.gz design-b623edf7520174219db33f2f045fbe6ed7558aa0.zip | |
merged conflict
Diffstat (limited to 'images')
| -rw-r--r-- | images/contributopia.jpg | bin | 0 -> 191017 bytes |
| -rw-r--r-- | images/docker.jpg | bin | 0 -> 108735 bytes |
| -rw-r--r-- | images/docker1.jpg | bin | 0 -> 54911 bytes |
| -rw-r--r-- | images/docker2.jpg | bin | 0 -> 43407 bytes |
| -rw-r--r-- | images/docker3.jpg | bin | 0 -> 39685 bytes |
| -rw-r--r-- | images/domainepublic.jpg | bin | 0 -> 811911 bytes |
| -rw-r--r-- | images/duchesse.png | bin | 0 -> 28543 bytes |
| -rw-r--r-- | images/filament.png | bin | 0 -> 30128 bytes |
| -rw-r--r-- | images/geocities.jpg | bin | 0 -> 221819 bytes |
| -rw-r--r-- | images/indie.png | bin | 0 -> 664574 bytes |
| -rw-r--r-- | images/mastodon.jpg | bin | 0 -> 88865 bytes |
| -rw-r--r-- | images/mastodon2.jpg | bin | 0 -> 121650 bytes |
| -rw-r--r-- | images/mobilizon.jpg | bin | 0 -> 140265 bytes |
| -rw-r--r-- | images/nomagic.jpg | bin | 0 -> 107271 bytes |
| -rw-r--r-- | images/peertube.jpg | bin | 0 -> 107897 bytes |
| -rw-r--r-- | images/spritely.jpg | bin | 0 -> 81919 bytes |
| -rw-r--r-- | images/tila.png | bin | 0 -> 229094 bytes |
| -rw-r--r-- | images/zaclys.png | bin | 0 -> 270551 bytes |
18 files changed, 0 insertions, 0 deletions
diff --git a/images/contributopia.jpg b/images/contributopia.jpg Binary files differnew file mode 100644 index 0000000..a32498a --- /dev/null +++ b/images/contributopia.jpg diff --git a/images/docker.jpg b/images/docker.jpg Binary files differnew file mode 100644 index 0000000..f7c3bc4 --- /dev/null +++ b/images/docker.jpg diff --git a/images/docker1.jpg b/images/docker1.jpg Binary files differnew file mode 100644 index 0000000..caa66b1 --- /dev/null +++ b/images/docker1.jpg diff --git a/images/docker2.jpg b/images/docker2.jpg Binary files differnew file mode 100644 index 0000000..11b904c --- /dev/null +++ b/images/docker2.jpg diff --git a/images/docker3.jpg b/images/docker3.jpg Binary files differnew file mode 100644 index 0000000..5b515ce --- /dev/null +++ b/images/docker3.jpg diff --git a/images/domainepublic.jpg b/images/domainepublic.jpg Binary files differnew file mode 100644 index 0000000..8ceac74 --- /dev/null +++ b/images/domainepublic.jpg diff --git a/images/duchesse.png b/images/duchesse.png Binary files differnew file mode 100644 index 0000000..77086dc --- /dev/null +++ b/images/duchesse.png diff --git a/images/filament.png b/images/filament.png Binary files differnew file mode 100644 index 0000000..b03e7a6 --- /dev/null +++ b/images/filament.png diff --git a/images/geocities.jpg b/images/geocities.jpg Binary files differnew file mode 100644 index 0000000..41f7b48 --- /dev/null +++ b/images/geocities.jpg diff --git a/images/indie.png b/images/indie.png Binary files differnew file mode 100644 index 0000000..1a202a7 --- /dev/null +++ b/images/indie.png diff --git a/images/mastodon.jpg b/images/mastodon.jpg Binary files differnew file mode 100644 index 0000000..4cbf719 --- /dev/null +++ b/images/mastodon.jpg diff --git a/images/mastodon2.jpg b/images/mastodon2.jpg Binary files differnew file mode 100644 index 0000000..8a1aae5 --- /dev/null +++ b/images/mastodon2.jpg diff --git a/images/mobilizon.jpg b/images/mobilizon.jpg Binary files differnew file mode 100644 index 0000000..c845dc5 --- /dev/null +++ b/images/mobilizon.jpg diff --git a/images/nomagic.jpg b/images/nomagic.jpg Binary files differnew file mode 100644 index 0000000..9c58fc2 --- /dev/null +++ b/images/nomagic.jpg diff --git a/images/peertube.jpg b/images/peertube.jpg Binary files differnew file mode 100644 index 0000000..cc1ce81 --- /dev/null +++ b/images/peertube.jpg diff --git a/images/spritely.jpg b/images/spritely.jpg Binary files differnew file mode 100644 index 0000000..ca953db --- /dev/null +++ b/images/spritely.jpg diff --git a/images/tila.png b/images/tila.png Binary files differnew file mode 100644 index 0000000..dafe6d9 --- /dev/null +++ b/images/tila.png diff --git a/images/zaclys.png b/images/zaclys.png Binary files differnew file mode 100644 index 0000000..8ef4ba5 --- /dev/null +++ b/images/zaclys.png |
