Home
last modified time | relevance | path

Searched hist:e33449a85c8468e2e48c870680e1f12f14f1f59d (Results 1 – 5 of 5) sorted by relevance

/plugin/autotranslation/conf/
H A Ddefault.phpe33449a85c8468e2e48c870680e1f12f14f1f59d Tue Aug 30 12:03:14 UTC 2016 Gerry Weißbach <gerry.w@gammaproduction.de> Merge remote-tracking branch 'splitbrain/master' into HEAD

# Conflicts:
# action.php
# conf/default.php
# conf/metadata.php
# helper.php
# lang/en/settings.php

H A Dmetadata.phpe33449a85c8468e2e48c870680e1f12f14f1f59d Tue Aug 30 12:03:14 UTC 2016 Gerry Weißbach <gerry.w@gammaproduction.de> Merge remote-tracking branch 'splitbrain/master' into HEAD

# Conflicts:
# action.php
# conf/default.php
# conf/metadata.php
# helper.php
# lang/en/settings.php

/plugin/autotranslation/lang/en/
H A Dsettings.phpe33449a85c8468e2e48c870680e1f12f14f1f59d Tue Aug 30 12:03:14 UTC 2016 Gerry Weißbach <gerry.w@gammaproduction.de> Merge remote-tracking branch 'splitbrain/master' into HEAD

# Conflicts:
# action.php
# conf/default.php
# conf/metadata.php
# helper.php
# lang/en/settings.php

/plugin/autotranslation/
H A Daction.phpe33449a85c8468e2e48c870680e1f12f14f1f59d Tue Aug 30 12:03:14 UTC 2016 Gerry Weißbach <gerry.w@gammaproduction.de> Merge remote-tracking branch 'splitbrain/master' into HEAD

# Conflicts:
# action.php
# conf/default.php
# conf/metadata.php
# helper.php
# lang/en/settings.php

H A Dhelper.phpe33449a85c8468e2e48c870680e1f12f14f1f59d Tue Aug 30 12:03:14 UTC 2016 Gerry Weißbach <gerry.w@gammaproduction.de> Merge remote-tracking branch 'splitbrain/master' into HEAD

# Conflicts:
# action.php
# conf/default.php
# conf/metadata.php
# helper.php
# lang/en/settings.php