search

kalamuna / playbox

A playground for ambitious would-be code artists.
http://live-playbox.at.kalamuna.com/
GNU General Public License v2.0
5 stars 29 forks source link

75 declare winner #118

Closed oneorangecat closed 8 years ago

oneorangecat commented 8 years ago

Completed features detailed in #75, plus a minor typo fix in playbox_admin.module (was failing silently)

RobLoach commented 8 years ago

Looks really good! There are some merge conflicts, however. GitHub provides the documentation to resolve them below. I'll be available next week if you would like assistance going through it.

Thanks a lot! Coming along nicely.

pirog commented 8 years ago

Nice! Thanks again @RobLoach! Always great to have your discerning eye.

pirog commented 8 years ago

Merge conflict was on me so i've resolved that and also tested the func here. ENGAGE MERGE MINOTAUR!