Merge branch 'action-patches' into patches-intg
Zachary Stevens [Thu, 19 Nov 2009 01:09:26 +0000 (01:09 +0000)]
1  2 
gitalist.conf
lib/Gitalist/Controller/Root.pm
t/03legacy_uri.t

diff --cc gitalist.conf
@@@ -42,5 -42,9 +42,9 @@@ project_maxdepth 200
  
  <paging>
    log = 50
 -  summary = 16
 +  summary = 17
  </paging>
+ <patches>
+   max = 16
+ </patches>
Simple merge
Simple merge