From 55cecdbb6c961441330c928f9ed587582f317f4b Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 07 Oct 2011 21:11:55 -0400
Subject: [PATCH] Merge branch 'master' into rpc

---
 docs/01_screenshots.mkd |   16 ++++++++++++++++
 1 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/docs/01_screenshots.mkd b/docs/01_screenshots.mkd
index 5ab94d3..3b50c13 100644
--- a/docs/01_screenshots.mkd
+++ b/docs/01_screenshots.mkd
@@ -44,4 +44,20 @@
 	<br/>Blame
 </td></tr>
 
+<tr><td>
+	<a rel="screenshots_group" href="screenshots/12.png" title="Federation Panels">![FederationPanels](thumbs/12.png)</a>
+	<br/>Federation Panels
+</td><td>
+	<a rel="screenshots_group" href="screenshots/13.png" title="Detailed Status of a Registration">![RegistrationStatus](thumbs/13.png)</a>
+	<br/>Detailed Status of a Registration
+</td><td>
+	<a rel="screenshots_group" href="screenshots/14.png" title="Send Proposal">![Propose](thumbs/14.png)</a>
+	<br/>Send Proposal
+</td></tr>
+
+<tr><td>
+	<a rel="screenshots_group" href="screenshots/15.png" title="Reviewing Received Proposal">![ReviewProposal](thumbs/15.png)</a>
+	<br/>Reviewing Received Proposal
+</td></tr>
+
 </table>
\ No newline at end of file

--
Gitblit v1.9.1