diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-07-09 07:05:29 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2018-07-09 07:13:59 +0200 |
| commit | d392020da6ff4511a2925b327de23933f374bea3 (patch) | |
| tree | e86a590276a96ef72d5ed49f79998e7680969cb6 /app/javascript/images | |
| parent | c699b2d141d7aa910bd81ae5fe881ecec7039395 (diff) | |
| parent | 1ca4e51eb38de6de81cedf3ddcdaa626f1d1c569 (diff) | |
Merge branch 'master' into glitch-soc/tentative-merge
Conflicts: README.md app/controllers/statuses_controller.rb app/lib/feed_manager.rb config/navigation.rb spec/lib/feed_manager_spec.rb Conflicts were resolved by taking both versions for each change. This means the two filter systems (glitch-soc's keyword mutes and tootsuite's custom filters) are in place, which will be changed in a follow-up commit.
Diffstat (limited to 'app/javascript/images')
| -rw-r--r-- | app/javascript/images/elephant-fren.png | bin | 40859 -> 34530 bytes |
| -rw-r--r-- | app/javascript/images/mailer/icon_cached.png | bin | 582 -> 423 bytes |
| -rw-r--r-- | app/javascript/images/mailer/icon_done.png | bin | 279 -> 253 bytes |
| -rw-r--r-- | app/javascript/images/mailer/icon_email.png | bin | 520 -> 387 bytes |
| -rw-r--r-- | app/javascript/images/mailer/icon_file_download.png | bin | 271 -> 225 bytes |
| -rw-r--r-- | app/javascript/images/mailer/icon_grade.png | bin | 541 -> 412 bytes |
| -rw-r--r-- | app/javascript/images/mailer/icon_lock_open.png | bin | 550 -> 387 bytes |
| -rw-r--r-- | app/javascript/images/mailer/icon_person_add.png | bin | 512 -> 376 bytes |
| -rw-r--r-- | app/javascript/images/mailer/icon_reply.png | bin | 391 -> 319 bytes |
| -rw-r--r-- | app/javascript/images/mailer/logo_full.png | bin | 3052 -> 2371 bytes |
| -rw-r--r-- | app/javascript/images/mailer/logo_transparent.png | bin | 627 -> 506 bytes |
| -rw-r--r-- | app/javascript/images/reticle.png | bin | 3053 -> 2199 bytes |
| -rw-r--r-- | app/javascript/images/void.png | bin | 174 -> 174 bytes |
13 files changed, 0 insertions, 0 deletions
diff --git a/app/javascript/images/elephant-fren.png b/app/javascript/images/elephant-fren.png index 3b64edf08..38b1e3cba 100644 --- a/app/javascript/images/elephant-fren.png +++ b/app/javascript/images/elephant-fren.png Binary files differdiff --git a/app/javascript/images/mailer/icon_cached.png b/app/javascript/images/mailer/icon_cached.png index 210833d34..5c993dbee 100644 --- a/app/javascript/images/mailer/icon_cached.png +++ b/app/javascript/images/mailer/icon_cached.png Binary files differdiff --git a/app/javascript/images/mailer/icon_done.png b/app/javascript/images/mailer/icon_done.png index 0d2ef0cb8..f7f95a0e8 100644 --- a/app/javascript/images/mailer/icon_done.png +++ b/app/javascript/images/mailer/icon_done.png Binary files differdiff --git a/app/javascript/images/mailer/icon_email.png b/app/javascript/images/mailer/icon_email.png index aae9d2bb9..13967009a 100644 --- a/app/javascript/images/mailer/icon_email.png +++ b/app/javascript/images/mailer/icon_email.png Binary files differdiff --git a/app/javascript/images/mailer/icon_file_download.png b/app/javascript/images/mailer/icon_file_download.png index 8a6a8673b..3f7ac429b 100644 --- a/app/javascript/images/mailer/icon_file_download.png +++ b/app/javascript/images/mailer/icon_file_download.png Binary files differdiff --git a/app/javascript/images/mailer/icon_grade.png b/app/javascript/images/mailer/icon_grade.png index 895b57d0a..8c212b7ee 100644 --- a/app/javascript/images/mailer/icon_grade.png +++ b/app/javascript/images/mailer/icon_grade.png Binary files differdiff --git a/app/javascript/images/mailer/icon_lock_open.png b/app/javascript/images/mailer/icon_lock_open.png index 9f62eadc2..c854c3bdb 100644 --- a/app/javascript/images/mailer/icon_lock_open.png +++ b/app/javascript/images/mailer/icon_lock_open.png Binary files differdiff --git a/app/javascript/images/mailer/icon_person_add.png b/app/javascript/images/mailer/icon_person_add.png index 3453060ae..6290a42ae 100644 --- a/app/javascript/images/mailer/icon_person_add.png +++ b/app/javascript/images/mailer/icon_person_add.png Binary files differdiff --git a/app/javascript/images/mailer/icon_reply.png b/app/javascript/images/mailer/icon_reply.png index 8bce4955c..a70093356 100644 --- a/app/javascript/images/mailer/icon_reply.png +++ b/app/javascript/images/mailer/icon_reply.png Binary files differdiff --git a/app/javascript/images/mailer/logo_full.png b/app/javascript/images/mailer/logo_full.png index 1c4f33287..82d981fc6 100644 --- a/app/javascript/images/mailer/logo_full.png +++ b/app/javascript/images/mailer/logo_full.png Binary files differdiff --git a/app/javascript/images/mailer/logo_transparent.png b/app/javascript/images/mailer/logo_transparent.png index 8fda4f67f..6dbcc2e8d 100644 --- a/app/javascript/images/mailer/logo_transparent.png +++ b/app/javascript/images/mailer/logo_transparent.png Binary files differdiff --git a/app/javascript/images/reticle.png b/app/javascript/images/reticle.png index 998994f5c..41a5d1c3a 100644 --- a/app/javascript/images/reticle.png +++ b/app/javascript/images/reticle.png Binary files differdiff --git a/app/javascript/images/void.png b/app/javascript/images/void.png index 10b274f18..d73066688 100644 --- a/app/javascript/images/void.png +++ b/app/javascript/images/void.png Binary files differ |
