CloudBotIRC / CloudBot

CloudBot - The simple, fast, expandable, open-source Python IRC Bot!
GNU General Public License v3.0
273 stars 250 forks source link

Fixing soundcloud py regex. #237

Closed knight-ryu12 closed 8 years ago

knight-ryu12 commented 8 years ago

I think commit is messed up. Idk why it happening.

knight-ryu12 commented 8 years ago

Hmm. I'll make another pr with one commit. CLOSING.

daboross commented 8 years ago

I can just merge the last one, it'll be fine.

The thing with the multiple branches is that the master branch of this repository is not the current version, but rather an old version for a previous python version. The python3.4 branch has many updates, and is, as the name suggests, for python3.4.

Edit: at least that's what I thought the master branch was, maybe it's changed since I worked a lot on the project. I'll try to get this merged to where it's appropriate.

daboross commented 8 years ago

Merged into python3.4 via https://github.com/CloudBotIRC/CloudBot/commit/4ff100a0084071b785ee09da924f37fee34286c9.

tuxxy commented 8 years ago

Holy shit, someone merged something!!! PRAISE TORVALDS.