You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iota.apache.org by to...@apache.org on 2016/07/04 19:00:35 UTC

[2/2] incubator-iota git commit: Merge branch 'IOTA-19' of https://github.com/barbaragomes/incubator-iota

Merge branch 'IOTA-19' of https://github.com/barbaragomes/incubator-iota


Project: http://git-wip-us.apache.org/repos/asf/incubator-iota/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-iota/commit/ebad1418
Tree: http://git-wip-us.apache.org/repos/asf/incubator-iota/tree/ebad1418
Diff: http://git-wip-us.apache.org/repos/asf/incubator-iota/diff/ebad1418

Branch: refs/heads/master
Commit: ebad14181a316699f9e747b00bd28d8df7e4f8c1
Parents: 48aa93d c6edbe0
Author: Tony Faustini <to...@apache.org>
Authored: Mon Jul 4 11:59:09 2016 -0700
Committer: Tony Faustini <to...@apache.org>
Committed: Mon Jul 4 11:59:09 2016 -0700

----------------------------------------------------------------------
 fey-core/src/main/resources/application.conf | 24 ++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)
----------------------------------------------------------------------