projects
/
users
/
andresfreund
/
postgres.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
286eff5
241fef2
)
Merge branch 'jsonb_and_hstore' of github.com:feodor/postgres into jsonb_and_hstore
author
Teodor Sigaev
<
[email protected]
>
Fri, 28 Feb 2014 14:02:56 +0000
(18:02 +0400)
committer
Teodor Sigaev
<
[email protected]
>
Fri, 28 Feb 2014 14:02:56 +0000
(18:02 +0400)
Conflicts:
src/backend/utils/adt/jsonfuncs.c
Trivial merge
projects / users / andresfreund / postgres.git / commitdiff