[WIP] Merge 1.2 into master

datamapper / dm-types

DataMapper plugin providing extra data types

http://datamapper.org/

MIT License

55 stars 80 forks source link

[WIP] Merge 1.2 into master #80

Closed solnic closed 9 years ago

solnic commented 9 years ago

This is massively broken at the moment. I'm not entirely sure if I merged conflicts properly. I'll be working on that in a week but if anybody can pick it up and help before that, please do :)

dkubb commented 9 years ago

@solnic interesting. I already merged release-1.2 into master. Maybe try rebasing this on top of master and see what the diff is.

solnic commented 9 years ago

OH well doooh...:) I did that a couple of weeks ago or so and didn't push immediately, doesn't matter now, it's great you managed to merge it properly. Closing this one then.