Merge branch 'post-02' into post-03

# Conflicts:
#	README.md
This commit is contained in:
Philipp Oppermann
2019-04-03 10:45:48 +02:00

View File

@@ -1,6 +1,6 @@
# Blog OS (VGA Text Mode)
[![Build Status](https://travis-ci.org/phil-opp/blog_os.svg?branch=post-03)](https://travis-ci.org/phil-opp/blog_os/branches)
[![Azure Pipelines CI build](https://img.shields.io/azure-devops/build/phil-opp/blog_os/1/post-03.svg?label=Build&style=flat-square)](https://dev.azure.com/phil-opp/blog_os/_build?definitionId=1)
This repository contains the source code for the [VGA Text Mode][post] post of the [Writing an OS in Rust](https://os.phil-opp.com) series.