Merged wip-commissions and master, should I push it?

japacible / commission-me

Platform for commissioners and buyers to connect and finalize sales.

http://commissionme.herokuapp.com/

4 stars 3 forks source link

Merged wip-commissions and master, should I push it? #238

Closed kcorman closed 10 years ago

kcorman commented 10 years ago

As subject says. I noticed that there was some broken stuff in wip commissions that was fixed in master, so I merged them. This involved fixing (simple) conflicts in 6 files, so I was wondering if I should push it to master and/or wip-commissions.

quanc commented 10 years ago

Not sure who else is on right now, but I'd say push to master.

kcorman commented 10 years ago

Okay, I'm gonna do that.

kcorman commented 10 years ago

Merged (and also merged with most recent changes pushed while I was doing merge) bb5987b