Dmitry Ivanov e1f362e831 resolve conflicts

2017-04-19 14:05:53 +03:00

..

.gitignore

…

Makefile

…

pg_repack_jp.rst

Add new item in Japanese doc.

2017-04-11 23:49:10 +09:00

pg_repack.rst

resolve conflicts

2017-04-19 14:05:53 +03:00

release.rst

…

style.css

…