Miguel Jacq 408aef3941 Fix conflicts introduced from new changes in master branch		2017-11-01 14:00:00 +11:00
..
code-signing.md	Update to guidelines, remove some parentheses	2017-04-16 12:36:17 -07:00
coding-style.md	reinstate coding style variable line. Fix outlier command formatting in DisposableVM doc	2017-05-25 17:50:45 +10:00
devel-books.md	Improve book list	2017-07-05 22:25:50 -04:00
devel-faq.md	Merge remote-tracking branch 'origin/pr/357'	2017-05-06 23:49:41 +02:00
gsoc.md	Move translatable pages into qubes-doc	2017-07-19 20:30:21 -05:00
license.md	"sign-off" procedure description has moved	2017-05-13 15:14:39 -04:00
package-contributions.md	Fix variable; emphasize "comment" and "tag"	2017-06-30 20:26:32 -05:00
source-code.md	Link to Contributing Code	2016-11-19 22:54:27 -08:00
style-guide.md	more minor typo/grammar fixes	2017-05-12 15:58:22 +10:00
system-doc.md	Redirect old System Doc to new Developer Docs section	2016-10-19 16:13:51 -07:00
usability-ux.md	more minor typo/grammar fixes	2017-05-12 15:58:22 +10:00