commit 45450596db474b382c96511dabaf3f578f9cb2a7 Merge: a612f50 8345837 Author: Matthew Finkel sysrqb@torproject.org Date: Fri Apr 30 16:16:39 2021 +0000
Merge remote-tracking branch 'boklmgl/bug_40283'
README | 7 +++---- README.BUILD_ERRORS => doc/BUILD_ERRORS.txt | 0 README.HACKING => doc/HACKING.txt | 0 README.MAKEFILE => doc/MAKEFILE.txt | 0 .../common => doc}/how-to-create-gradle-dependencies-list.txt | 0 {projects/common => doc}/how-to-update-glean-parser.txt | 0 doc/rbm | 1 + projects/android-components/gradle-dependencies-list.txt | 2 +- projects/application-services/gradle-dependencies-list.txt | 2 +- projects/common/gen_gradle_deps_file.sh | 4 ++-- projects/fenix/gradle-dependencies-list.txt | 2 +- projects/geckoview/gradle-dependencies-list.txt | 2 +- projects/tor-android-service/gradle-dependencies-list.txt | 2 +- projects/tor-onion-proxy-library/gradle-dependencies-list.txt | 2 +- 14 files changed, 12 insertions(+), 12 deletions(-)