Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

master into 0.17.x #5591

Merged
merged 8 commits into from
Jan 12, 2019
Merged

master into 0.17.x #5591

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d34eaa6
Merge pull request #5513 from learningequality/0.17.x
benjaoming Aug 31, 2017
0ddf727
Merge branch '0.17.x'
Dec 20, 2017
7f0ddb7
Merge pull request #5584 from learningequality/0.17.x
benjaoming Jul 12, 2018
4e34856
Merge pull request #5585 from learningequality/0.17.x
benjaoming Jul 12, 2018
985ecd8
Fix typo
maiki Sep 3, 2018
571918e
Merge pull request #5588 from maiki/patch-1
benjaoming Jan 12, 2019
1ba44dc
Merge remote-tracking branch 'upstream/master' into 0.17.x
Jan 12, 2019
3b4bd80
Merge remote-tracking branch 'upstream/master' into 0.17.x-master
Jan 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/installguide/install_all.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ Debian, Raspberry Pi, Linux Mint etc.
You will be prompted to enter some configuration information.
You should read the on-screen instructions carefully, but some explanation is included here:

1. Choose weather you want to run KA Lite on boot or not. We recommend choosing yes, as it simplifies data management.
1. Choose whether you want to run KA Lite on boot or not. We recommend choosing yes, as it simplifies data management.
If you choose not to, you must manually start KA lite every time.

.. note::
Expand Down