Merge branch 'refs/heads/master' into Profile

Conflicts: js/githubresume.js
2026-01-06 03:30:01 -06:00 · 2012-09-04 23:36:15 +02:00
parent a04f2bfdca 47b4c0a793
commit 9c5dd8f6ce
2 changed files with 57 additions and 6 deletions
--- a/views/resume.html
+++ b/views/resume.html
@@ -12,7 +12,7 @@
 				<div class="yui-u first">
 					<hgroup>
 						<h1 class="fn">{{name}}</h1>
-						<h2>Passionate github user</h2>
+						<h2>{{userStatus}}</h2>
 					</hgroup>
 				</div>