projects / order_line_extra.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dbb33a5 f4680cc)
Merge branch 'pickup'
authorMaxime Bourget <bmx007@gmail.com>
Sat, 15 Jun 2013 10:40:48 +0000 (11:40 +0100)
committerMaxime Bourget <bmx007@gmail.com>
Sat, 15 Jun 2013 10:40:48 +0000 (11:40 +0100)

Trivial merge