|
mgoodrich <mark.goodrich@live.com>
|
a621df1a7f6f155d90454a3a8283fd6cbf6368c9
a621df1a7f6f155d90454a3a8283fd6cbf6368c9 |
follow-up fix of merge conflict |
|
|
mgoodrich <mark.goodrich@live.com>
|
efe76b3cb02cd95e4542337cec1832707beb06cf
efe76b3cb02cd95e4542337cec1832707beb06cf |
Merge branch 'AF-64'
# Conflicts:
# api/src/main/java/org/openmrs/module/appframework/service/AppFrameworkServiceImpl.java
# api/src/test/java/org/openmrs/module/appframework/service/AppFrameworkServiceImplTest.java |
|
|
mgoodrich <mark.goodrich@live.com>
|
116c9f2545efbbf160b3563db5a9396c54ca20bb
m 116c9f2545efbbf160b3563db5a9396c54ca20bb |
AF-64: in "checkRequire" context add equivalent of ECMA6 "some" method |
|
|
mgoodrich <mark.goodrich@live.com>
|
8c1521a6fc0087e163d0ea6add33b6f1ae403390
m 8c1521a6fc0087e163d0ea6add33b6f1ae403390 |
AF-64: in "checkRequire" context add equivalent of ECMA6 "some" metho |
|