From 544bec2cee3f86491548381b8cf50224b30841ef Mon Sep 17 00:00:00 2001
From: chris <cg@zknt.org>
Date: Tue, 2 Apr 2019 18:59:05 +0200
Subject: [PATCH 1/3] build and install php-intl in Dockerfile.apache.

---
 contrib/docker/Dockerfile.apache | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/contrib/docker/Dockerfile.apache b/contrib/docker/Dockerfile.apache
index 03871d4e7..7835f6c8b 100644
--- a/contrib/docker/Dockerfile.apache
+++ b/contrib/docker/Dockerfile.apache
@@ -6,7 +6,7 @@ ARG COMPOSER_CHECKSUM="67bebe9df9866a795078bb2cf21798d8b0214f2e0b2fd81f2e907a8ef
 RUN apt-get update \
  && apt-get install -y --no-install-recommends git gosu \
       optipng pngquant jpegoptim gifsicle \
-      libfreetype6 libjpeg62-turbo libpng16-16 libxpm4 libwebp6 libmagickwand-6.q16-3 \
+      libfreetype6 libicu-dev libjpeg62-turbo libpng16-16 libxpm4 libwebp6 libmagickwand-6.q16-3 \
       libfreetype6-dev libjpeg62-turbo-dev libpng-dev libxpm-dev libwebp-dev libmagickwand-dev \
  && docker-php-source extract \
  && docker-php-ext-configure gd \
@@ -14,7 +14,7 @@ RUN apt-get update \
       --with-jpeg-dir=/usr/lib/x86_64-linux-gnu/ \
       --with-xpm-dir=/usr/lib/x86_64-linux-gnu/ \
       --with-webp-dir=/usr/lib/x86_64-linux-gnu/ \
- && docker-php-ext-install pdo_mysql pcntl gd exif bcmath \
+ && docker-php-ext-install pdo_mysql pcntl gd exif bcmath intl \
  && pecl install imagick \
  && docker-php-ext-enable imagick pcntl imagick gd exif \
  && a2enmod rewrite remoteip \

From 8002f16a657a8b532d960a222ae825c503e1e861 Mon Sep 17 00:00:00 2001
From: trwnh <a@trwnh.com>
Date: Wed, 3 Apr 2019 01:01:22 -0500
Subject: [PATCH 2/3] Add vertical margin to profile timeline view

---
 resources/assets/js/components/Profile.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/assets/js/components/Profile.vue b/resources/assets/js/components/Profile.vue
index f1c1bda8d..4595db47d 100644
--- a/resources/assets/js/components/Profile.vue
+++ b/resources/assets/js/components/Profile.vue
@@ -168,7 +168,7 @@
 				</div>
 				<div class="row" v-if="mode == 'list'">
 					<div class="col-md-8 col-lg-8 offset-md-2 px-0 mb-3 timeline">
-						<div class="card status-card card-md-rounded-0" :data-status-id="status.id" v-for="(status, index) in timeline" :key="status.id">
+						<div class="card status-card card-md-rounded-0 my-sm-2 my-md-3 my-lg-4" :data-status-id="status.id" v-for="(status, index) in timeline" :key="status.id">
 
 							<div class="card-header d-inline-flex align-items-center bg-white">
 								<img v-bind:src="status.account.avatar" width="32px" height="32px" style="border-radius: 32px;">

From 03e97113eb006ba545c4a78789853901963d8d0e Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Wed, 3 Apr 2019 00:29:28 -0600
Subject: [PATCH 3/3] Update compiled assets

---
 public/js/profile.js     | Bin 50734 -> 50754 bytes
 public/mix-manifest.json | Bin 775 -> 775 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/public/js/profile.js b/public/js/profile.js
index a3d6c049ee1088b35685d70e762412e3537773fe..ce3af0176917c23bd3524b99acd118f6439636dd 100644
GIT binary patch
delta 253
zcmZ42!+fZRd4oRZ=3LGQ4i?7{&+y5D6D=omFBIS~Og6VnGBdZB9KBFMq9DJhq$n}7
zBswLrBvH3a7fI3(S*4t0L4I+GZf0_R9){A>3n#KT2Nfm*ZSdVJCd4PtQV?ODy;;MM
zNl`)}w^Fw_SJwzc=cecygXo-eU6ajPK|5vO7Hoc<XKu)B;p{&7<5F?<Vhts*gC`Vq
zPF7s78f@BR`C>V_vcw{VL|dSA0Z^%urggDio<^dkUSh3IWl?7G<nt3vHrp?LuLJ<_
CMpOX+

delta 193
zcmX@q!@RDCd4oPDOLC5n(qxAUxyiPToctAq`Tk0p*2Q{x8i|^EiJP@KV>noxg9?);
zcMDo>4iZ+9XR!oo*j!=6q_}xf@J<<yv{VaYGsCpR&A|ochLcSftzuKE2-i<l0&4Jt
zOHTF`lAHWXPzY7PNJto2Kp(+r5t_&Xa?0f1g;Fda<0h|O*vV2^l$i{4smbQx#qX5>
D{h2=2

diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index c80537c5e9ccf6f797f61b96fda3176bfbd436b3..0d97ebae50f10fb49d10292b4dca6bfaebc5de02 100644
GIT binary patch
delta 32
ncmZo?YiHYF$Rv_#kY-|GXl|NnV49SiW@eITVw^nLmFW-wkZ%b*

delta 32
ncmZo?YiHYF$Rv`KYM5wXkZh8aW}KK}YGPuUlxR8GmFW-wms1Il