Permalink
Browse files

Merge branch 'master' of github.com:perl6/faq

Conflicts:
	answers.md
	web/index.tmpl
  • Loading branch information...
2 parents f0dd5f9 + 8a5705b commit 356b75a11daa0cc09a952ad946414f673109f43a @moritz moritz committed Oct 17, 2015
Showing with 0 additions and 0 deletions.

0 comments on commit 356b75a

Please sign in to comment.