Merge branch 'master' of ssh://37.187.249.111:2200/opt/git/admi_facile

This commit is contained in:
Xavier J 2015-08-11 15:41:37 +02:00
commit 5536b7cd78

View file

@ -1516,12 +1516,12 @@
<workItem from="1439223409031" duration="298000" />
<workItem from="1439223770410" duration="159000" />
<workItem from="1439223968969" duration="662000" />
<workItem from="1439278771949" duration="13999000" />
<workItem from="1439278771949" duration="14077000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="235361000" />
<option name="totallyTimeSpent" value="235439000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">