projects / MojoFacets.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 814278b b4f706b)
Merge branch 'master' of mjesec.ffzg.hr:/git/MojoFacets
authorDobrica Pavlinusic <dpavlin@rot13.org>
Wed, 30 Jun 2010 22:12:46 +0000 (00:12 +0200)
committerDobrica Pavlinusic <dpavlin@rot13.org>
Wed, 30 Jun 2010 22:12:46 +0000 (00:12 +0200)
Conflicts:
templates/all_checkboxes.html.ep

1  2 
templates/all_checkboxes.html.ep patch | diff1 | diff2 | blob | history

diff --cc templates/all_checkboxes.html.ep
Simple merge
Server-side facet browsing using Mojolicious and jQuery UI