This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository lima. See http://git.chorem.org/lima.git commit 937f0ae44c3f763e62529818bff3219d758ed0fd Merge: 5947526 d45413e Author: Maven Release <maven-release@codelutin.com> Date: Fri Mar 20 22:12:05 2015 +0000 Merge branch 'master' into develop .../src/license/THIRD-PARTY.properties | 13 +++++++++++-- .../lima/business/config/LimaConfigOptionDef.java | 22 ++++++++++++++++++++++ .../java/org/chorem/lima/entity/EntryImpl.java | 0 .../chorem/lima/entity/FinancialStatementImpl.java | 0 .../lima/entity/FinancialTransactionImpl.java | 0 .../org/chorem/lima/entity/FiscalPeriodImpl.java | 0 .../org/chorem/lima/entity/VatStatementImpl.java | 0 .../org/chorem/lima/report/LimaReportConfig.java | 22 ++++++++++++++++++++++ .../lima/report/service/GeneratedReport.java | 22 ++++++++++++++++++++++ lima-server/pom.xml | 5 +---- .../chorem/lima}/server/FormatsEnum.java | 9 +++++---- .../chorem/lima}/server/HttpServerService.java | 12 +++++------- .../chorem/lima/server}/LimaServer.java | 13 ++++++------- .../chorem/lima}/server/LimaServerConfig.java | 22 ++++++++++++++++++++++ .../src/main/java/org/chorem/lima/LimaMain.java | 1 + 15 files changed, 117 insertions(+), 24 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.