Revision - ac7e6bb - Merge https://github.com/coreos/template-project

Revision ac7e6bb0025e6f541f0f340ede1ef19f2730d9f9 authored by Brandon Philips on 25 June 2014, 15:56:15 UTC, committed by Brandon Philips on 25 June 2014, 15:57:02 UTC

Merge https://github.com/coreos/template-project

Conflicts:
	CONTRIBUTING.md
	LICENSE

2 parent s 774cb03 + 774cf34

Files
Changes

Permalinks

File	Mode	Size
dashboard
leader
lock
README.md	-rw-r--r--	446 bytes
mod.go	-rw-r--r--	922 bytes

Showing with 0 additions and 0 deletions (0 / 0 diffs computed)

Computing file changes ...

Merge https://github.com/coreos/template-project

README.md