| commit | 8e0925edc96e642e08e2e230f536568d8a26d54c | [log] [tgz] |
|---|---|---|
| author | Maxim Solodovnik <solomax666@gmail.com> | Fri May 12 09:14:16 2017 +0700 |
| committer | Maxim Solodovnik <solomax666@gmail.com> | Fri May 12 09:14:16 2017 +0700 |
| tree | dc93ec4465a9fe6ccd42c2e9104420c394786b91 | |
| parent | a0dbf5aff07bab068b4e9e26bf53a6a16e124e7f [diff] | |
| parent | 8a06c7f5d5aebf8fb7750a40e1b3116998f2a112 [diff] |
Merge branch '3.2.x' of https://git-wip-us.apache.org/repos/asf/openmeetings into 3.2.x