From ef2c6f5384d13882cba5551e18296402aa4e5412 Mon Sep 17 00:00:00 2001
From: Tim Speckhals <github@timmyrs.de>
Date: Fri, 10 Aug 2018 19:06:25 +0200
Subject: [PATCH 1/3] Translate 'Direct Messages'

---
 resources/lang/de/navmenu.php | 1 +
 resources/lang/de/profile.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/resources/lang/de/navmenu.php b/resources/lang/de/navmenu.php
index bfaf81d2..7b983aa4 100644
--- a/resources/lang/de/navmenu.php
+++ b/resources/lang/de/navmenu.php
@@ -9,5 +9,6 @@ return [
     'settings' => 'Einstellungen',
     'admin' => 'Administration',
     'logout' => 'Abmelden',
+    'directMessages' => 'Privatnachrichten',
 
 ];
\ No newline at end of file
diff --git a/resources/lang/de/profile.php b/resources/lang/de/profile.php
index 294a90c8..db3a3c26 100644
--- a/resources/lang/de/profile.php
+++ b/resources/lang/de/profile.php
@@ -5,4 +5,4 @@ return [
   'emptyFollowers' => 'Diesem Benutzer folgt noch niemand!',
   'emptyFollowing' => 'Dieser Benutzer folgt noch niemanden!',
   'savedWarning'  => 'Nur du kannst sehen was du gespeichert hast',
-];
\ No newline at end of file
+];

From 96efb57cf06444b0ff95c4e1f77eafa69cd5d941 Mon Sep 17 00:00:00 2001
From: Angristan <angristan@pm.me>
Date: Fri, 10 Aug 2018 20:03:56 +0200
Subject: [PATCH 2/3] Add missing double quotes

---
 .env.example | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.env.example b/.env.example
index 18032f25..bbad988d 100644
--- a/.env.example
+++ b/.env.example
@@ -32,7 +32,7 @@ MAIL_PORT=2525
 MAIL_USERNAME=null
 MAIL_PASSWORD=null
 MAIL_ENCRYPTION=null
-MAIL_FROM_ADDRESS="pixelfed@example.com
+MAIL_FROM_ADDRESS="pixelfed@example.com"
 MAIL_FROM_NAME="Pixelfed"
 
 SESSION_DOMAIN="${APP_DOMAIN}"

From d654ce93d43daa7d7f050d9c6ec41693aadcca9b Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Fri, 10 Aug 2018 13:06:12 -0600
Subject: [PATCH 3/3] Add favicon

---
 public/img/favicon.png                | Bin 0 -> 2416 bytes
 resources/views/layouts/app.blade.php |   2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 public/img/favicon.png

diff --git a/public/img/favicon.png b/public/img/favicon.png
new file mode 100644
index 0000000000000000000000000000000000000000..ef5ab6f6c80cf9a1f251c4cea627c4383704bbc8
GIT binary patch
literal 2416
zcmXw4dpwi-A9o4MB}N^W9G5PVdpT0MOpBOXl2e%3&aY0%<)F)P6xn3M5QRjhWpg_m
zx7?aAmq=1mD6}jU!)9~YW{l_e=)BJJdVfFP_xJPud_K?nkLUY(QhmH#RTOm;rKF@(
z5N^)C;Evf^5LqyeoJs}-nFSwDKNr_1&%WD{9HI)BpvJ|k{THF!>w7@X!9zKO9b5t!
zp`gku)L@ptxmi$dlKMiS##VjePrcqaF7gxyd5Rmj1&}O&<VRe5p|jGxi~mA<3q9KW
zms=4`f@Sjo2rkm~hor+vRR#$+z>Ry;fP+=zQFkr&8*uzRxHtB46IH<%@m}rbfn7)!
z4$_s^qs<LD!UvDu$2jp)JgPRYM`sEDr=W}^XuL1zz%AEb;y<wBHE8mK;0s7+;Xf1!
ze+~cu$=s;0hq&0Sx!j}K2_tsEh@DP^ewSOr9-+KQlw@jhV^b{Z&E<8guwNRG*@2`P
z6nPd&cO-UzfDzjqGd`oPtPG#w(-rDio_X^Zir6R+Bz6#K4h7b<+o#a1lIHurkl3hp
zN8)oE{9p(bREuYVzW)7MEa9)sRbPyL0ah+g%z}-rPU%JLpmtcQka-g%YhUjRyLJ^$
z2X;E9b~~iJeQ#4V6V&9KRqC1l(D%t4i^rNtD`Uc|5D(G=D^ih_wcPl;8Q*poF(aTn
z{ahJk_9BTLFedB(NBwJ<v&MS8TsqDlADvmn*03`Mp57bDzx%%M>dQO+?cuP-^OzTb
z)OnN*@v~msr(en=?4J6bYz#)Upy3VZlnE4N9%YpH$%4Q%$4|P{MY_|FIa8>9meAuF
z>KX$TH;hUcMPWY#rv+BPt8SiZ2}}<tYa3fJ#m&G<)7+o`>ehk+jU9bh?bd<@$@~<r
zim`Ms`HNNhpnD4@-M>8ZTq(Trwp&whhJV?S92%lI7@UypUxH`}cDgm>(fX@fGa4TM
z4)l|GzRc|zsFs5qM7n>O^DPEg?;Z2%aMHL{>Ij%IC9upBzag5@=6KLB(*nQce9QcQ
zuuPr+kA*=NN#F%oyYB0KR!Y{R;N!{wTrZ9*0Xm~KAa_NUU#aT8d0kWQs;-(J$2E+8
z?YQfa#RtNG&2xZY69Co)z>0(-deA3W0svt#0EofwO1QZWY=FBM(DR^(gdhWe)iif?
zYXPYJz_%RZ!mZ>K01Oy{L~$HwNJhT_$^bwg09J~?6tMbl<0wcsfwA7Jz}D2Q@xUfH
z2M~d4Ln!%SAsP^iL`%zUtE9`IxM?>kXs})fOAO=Jg#q<~?CJGh(fUhaJMpsDn}{L_
zZY?vS@07s`Zz$(Zz^m%XU5_h5S<zBba<&NP6Mlb5H;jBO;5eyazvxu<HJu5YXo}E9
ziaIX6vmrU27H-(B-Zyfy((<~L_9C>t^HHr`mA7W=m#Z{~V8)}j`WVZj4&)kg{=pV5
zdG8~9MN%SJ^Q0C1D4f=I$F`@XN}iFN3e`RCWkvCS&Yx6v)VGIN8^z%tMS7$-Us!bB
zbI-HHy4f1@+rDM4*~M#Oc%8p-uIadmFjVDn4+V4a#>Xd57^~EW%ZWZTLJhUcD}CD1
zrrkIEClchKUr6UU8e{bHP`OVv07Uy;ndR(JVmh>CxX1grD&8|;NT<fQ?e&#Qb-Ex2
z5#FXMspE<>A%4*Pir2|?xQ}R?91{jkCdvg`0wxYY>}8G5kY!i2UYsd*Qed}bIrYo@
zY%HB@iR*%gWjE0cqO{bF%~lksGKz?unuMSNnb<W0b#{1se1SUdaIAVN`UzrSH$M`u
zT+A_3i?rg%&1P6Fm4~eai%^)VJDOSw{ZEU3-*&)A-_vWdAV2?i+l;1Te;7cLh9!wz
z5{dm3#KOY7va0IMUD~M5$mlhCbKSGXe;S^iMQV*Pk<;TaExT_LU}&-bU^yv*gbrE?
z??48YnzaGsHJ~x`v15XG%_~+ju7lMoSzP{b_)3Dfl)MS-?#PU<(F5Mfedl$Aog0uw
z)Ehv^f=I@bwjTKz-LP9R_T0J%O2ovG>Lyq{6P4TeFa|3kLdCi#%@~qBrj^uziN)<k
zb2j$1j=~$msxN7MD@u!}%?uB03xCa!_^cwZgXTRoz7en)tBu?#g+C#+cAcs$Bw37e
z_-pekpzW`JL0ocpdpK5~^%y#$ip=5wF)R$>d!AmG#>OOl==J*xG_;AGA<sz9FiMiK
zkY~ZUXYQGB^G~5GZds0~-(v7`JBbt=j6zRF$u`F*JH+9mn>IJsPEdyUvVo+X+t~q|
z17R7x7%QD;xEtB|v*;|1{oM(G!5m<WIdP=6w(qaf%jXLeWNqm%!}-&DKC*8!mSx%U
zEDF?ax=)s^A_eQAXGizERf+4};TF0J5{~2c$;83Jv2=6B#wV<-2z_0?*rilorOK|P
zJi!I7Z6d$nhGBmHW%hMBaA0<+x0kOf|4A?N!;FGVr_V>-PD!%toqM%*-U8KapN9O+
zibAqIOS<#TtPLl2=X=I98@*ZRJgtO<<yr3ZsIa(ls4gob-5|F*=gRvEe%J>-eTU!D
zGl`SazWi!JnBWv;tYoPC!z<!s<1l`3_X#z^m$zQjzx}S`gQTIR%GZ8-bNUka?3A<Z
z)#koB4wHM`O2xC%B9x?U9v9Y_)P~u|-~Kjh3u&LY%Id2;zcMi*7_@Ff@)y2g3r?R8
z&c>>mbqvbObj&D>#3|w@cW?XbN>8oFedIauhfIB|r;Lzp*zBD$q3w!PPnj!=iVx}W
zHt6UibGBt?cHOZtg*i!XC4b#^+-Zk$nrhFI;qj<klMp4B*%Ym@cW1EG&&T1~g_g9R
zA8NMa&K^=>EBzW3+AAGlC?kIG9UE(?5IlU8d~lystkVDJ&wY~VXRU9Rj(3?m?}}BJ
z#>-y}DUuKLbuw-+R1;=#Q>1C`4!8E!pnY2Hl>KP?TIb^JZjzfB_3a`qaM%kbzmH=0
zM?8h8nS<2^MALb<VF4A)bq(F@ki^M7sSTES%O#c2!prW(pTAi5#S(UG@BJz0(B4kn
z1-@BIV-k{JDkPW(HPrfdyUg$ZdCWiRJP)IheJtqmU|wb2$#3Zg9!XnVIQrNkk15u%
a5-Huis917Fg$V_JBvJ?$Z|7<_Ch`9s0Tm|z

literal 0
HcmV?d00001

diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index 663e85cf..c30441fb 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -20,7 +20,7 @@
     <meta name="medium" content="image">
     <meta name="theme-color" content="#10c5f8">
     <meta name="apple-mobile-web-app-capable" content="yes">
-
+    <link rel="shortcut icon" type="image/png" href="/img/favicon.png">
     <link rel="canonical" href="{{request()->url()}}">
     <link href="{{ mix('css/app.css') }}" rel="stylesheet">
     @stack('styles')