Commit Graph

20 Commits

Author SHA1 Message Date
Marek Marczykowski-Górecki
6f17716f4e Merge remote-tracking branch 'origin/pr/76' 2015-12-10 02:47:56 +01:00
Marek Marczykowski-Górecki
b047cae137 Merge remote-tracking branch 'origin/pr/75' 2015-12-10 02:47:49 +01:00
Marek Marczykowski-Górecki
451a36421c Merge remote-tracking branch 'origin/pr/74' 2015-12-10 02:47:29 +01:00
Marek Marczykowski-Górecki
729f94997d Merge remote-tracking branch 'origin/pr/73' 2015-12-10 02:47:20 +01:00
Patrick Schleizer
978f257f0f Update updating-whonix.md 2015-12-09 20:07:39 +00:00
Patrick Schleizer
44d542220e Update updating-whonix.md 2015-12-09 20:05:44 +00:00
Patrick Schleizer
9d4fe06b20 Update whonix.md 2015-12-09 20:01:18 +00:00
Patrick Schleizer
ea01a59c79 Update customizing-whonix.md 2015-12-09 19:59:09 +00:00
Patrick Schleizer
0e39d619d7 Update install-whonix.md 2015-12-09 19:56:44 +00:00
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
Marek Marczykowski-Górecki
165681899d Merge remote-tracking branch 'origin/pr/69' 2015-12-09 20:36:11 +01:00
Marek Marczykowski-Górecki
b72dc0db81 Merge remote-tracking branch 'origin/pr/68' 2015-12-09 20:35:56 +01:00
Marek Marczykowski-Górecki
74314ce739 Merge remote-tracking branch 'origin/pr/63' 2015-12-09 20:34:43 +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
c628a0cd1a Update updating-whonix.md 2015-12-09 16:06:30 +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