[tor-commits] [tpo/staging] Merge branch 'master' into staging

[emmapeel@xxxxxxxxxxxxxx]

commit 1a1c2aa8b222a173fc5c0a8e1b1ef5f7d890bc3f
Merge: a848be0 2dfd5f7
Author: emma peel <emma.peel@xxxxxxxxxx>
Date:   Wed Jun 5 16:19:25 2019 +0200

    Merge branch 'master' into staging

 content/menu/contents.lr | 2 +-
 databags/versions.ini    | 4 ++--
 models/sponsors.ini      | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits