search

bricoleurs / bricolage

Content management and publishing system
http://www.bricolagecms.org/
111 stars 51 forks source link

Desk asset counts. Again. #4

Closed gregheo closed 13 years ago

gregheo commented 13 years ago

Bric::Changes too!

phillipadsmith commented 13 years ago

I'm going to try to test these and merge them today.

gregheo commented 13 years ago

Hey, it automatically updates the pull request with my new commit! Well it's a three-in-one now.

theory commented 13 years ago

Pulled, thanks. Since you committed this stuff to rev-2.0 instead of a working branch, and your branch is out-of-date, I had to cherry-pick them. You'll need to re-jigger your rev-2.0 branch to get it right again. Easiest is probably to delete it altogether and create it from upstream again.

—Theory