commit ad782fac7d34c43a2737c6960927349fb58306e1 Merge: c2e5f13 e72ad6b Author: Sebastian Hahn sebastian@torproject.org Date: Wed Mar 2 14:23:58 2016 +0100

Merge remote-tracking branch 'donnchaC/orbot-on-download-page'

download/en/download-easy.wml | 14 ++++++++++++++ js/dlpage01.js | 6 +++++- js/jquery.client.min.js | 2 +- 3 files changed, 20 insertions(+), 2 deletions(-)