From: Gustav Eek Date: Thu, 27 Jun 2019 19:15:35 +0000 (+0200) Subject: Merge branch 'master' into case-of-multi-account X-Git-Url: https://git.g-eek.se/?a=commitdiff_plain;h=96e32bcca8ba9f885f5f22f850059102255c3562;p=interimap.git Merge branch 'master' into case-of-multi-account --- 96e32bcca8ba9f885f5f22f850059102255c3562 diff --cc .gitignore index b25c15b,d0e940e..95277ba --- a/.gitignore +++ b/.gitignore @@@ -1,1 -1,3 +1,4 @@@ *~ + /*.1 + /.pc/ ++