Commit Graph

7 Commits

Author SHA1 Message Date
Marek Marczykowski-Górecki
bd937d1211 Merge remote-tracking branch 'origin/pr/71'
Conflicts:
	privacy/install-whonix.md
2015-12-09 20:37:06 +01:00
Marek Marczykowski-Górecki
34bbcb3cff Merge remote-tracking branch 'origin/pr/70' 2015-12-09 20:36:25 +01:00
Patrick Schleizer
296851a947
fixed broken /en/ links
https://github.com/QubesOS/qubes-issues/issues/1460#issuecomment-163016388
2015-12-09 16:29:45 +00:00
Patrick Schleizer
3637b007fa
fixed spelling, reintroduced '-' for Whonix VM names
https://github.com/QubesOS/qubes-doc/pull/62#issuecomment-161467387
2015-12-09 16:12:02 +00:00
Patrick Schleizer
559f11b70a fix link 2015-12-09 16:04:48 +00:00
Brennan Novak
1ae209a64a moved Getting Started & Research to site repo QubesOS/qubes-issues#1460 2015-12-04 16:29:22 +01:00
Brennan Novak
84c1a0c722 fixed merge conflict QubesOS/qubes-issues#1202 2015-12-02 19:14:39 +01:00