]> sipb.mit.edu Git - ikiwiki.git/commit
conflict detection, merging, etc should be done now, I think
authorjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>
Sun, 19 Mar 2006 20:34:59 +0000 (20:34 +0000)
committerjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>
Sun, 19 Mar 2006 20:34:59 +0000 (20:34 +0000)
commit6b6fd778c7b35961736e9087f56e3872f6d9bdc9
treeb1102d61b413a81b0705418e35b9c3ecf8c37540
parent4d50e71d3117b515bf53cc4af8da6dbf75dcaca8
conflict detection, merging, etc should be done now, I think
ikiwiki
templates/editpage.tmpl