projects / xtuple / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0e0854f 6a56bde)
Merge branch 'node10-fix' into 23257-qr-final
authorSteve Hackbarth <stephenhackbarth@gmail.com>
Mon, 8 Sep 2014 20:43:11 +0000 (16:43 -0400)
committerSteve Hackbarth <stephenhackbarth@gmail.com>
Mon, 8 Sep 2014 20:43:11 +0000 (16:43 -0400)
1  2 
package.json patch | diff1 | diff2 | blob | history

diff --cc package.json
Simple merge
Unnamed repository; edit this file 'description' to name the repository.