You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@celix.apache.org by pn...@apache.org on 2019/08/16 14:38:55 UTC

[celix] 02/02: Merge branch 'develop' of github.com:apache/celix into develop

This is an automated email from the ASF dual-hosted git repository.

pnoltes pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/celix.git

commit 772cc21bd5e6ca4a52e535c406c33188a55f65b2
Merge: abb21e1 0b44123
Author: Pepijn Noltes <pe...@gmail.com>
AuthorDate: Fri Aug 16 16:37:07 2019 +0200

    Merge branch 'develop' of github.com:apache/celix into develop

 bundles/http_admin/README.md                   | 2 +-
 bundles/http_admin/http_admin/src/http_admin.c | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --cc bundles/http_admin/http_admin/src/http_admin.c
index 59eda4b,9acdd43..59eda4b
mode 100644,100755..100755
--- a/bundles/http_admin/http_admin/src/http_admin.c
+++ b/bundles/http_admin/http_admin/src/http_admin.c