search

joel-costigliola / assertj

AssertJ documentation
60 stars 30 forks source link

News fixes #36

Closed PascalSchumacher closed 8 years ago

PascalSchumacher commented 8 years ago

I did something wrong when rebasing, because this should be just one commit: 902f4c59221523fe8fdc290143a5aad6f0c8373f

I guess you are going to cherry-pick anyway, so it does not matter?

PascalSchumacher commented 8 years ago

@joel-costigliola I know you have a lot to do, but what about cherry-picking 902f4c5?

joel-costigliola commented 8 years ago

sure, don't hesitate to remind me of stuff, sometimes it just slips out of my mind (other times is because I'm busy). BTW I'll be off next week for two weeks ... holidays :-)

joel-costigliola commented 8 years ago

Integrated, thanks.

@PascalSchumacher just to let you know, when you want to update the documentation, you need to change the template files , generate the site and commit the generated files as explained here http://joel-costigliola.github.io/assertj/assertj-help.html. No big deal if you don't as I will do it anyway but it's good to know what the right thing is.

PascalSchumacher commented 8 years ago

Thanks for merging. :smile:

I will generate the site next time.

Enjoy your holidays! :smile: