[dev] [CatalinFrancu/dexonline] bcf3c8: Merge the admin/ and flex/ directories (under wwwb...

[GitHub via Dev]

  Branch: refs/heads/master
  Home:   https://github.com/CatalinFrancu/dexonline
  Commit: bcf3c84760526be5ffefddbde54a20ec2cca04ce
      https://github.com/CatalinFrancu/dexonline/commit/bcf3c84760526be5ffefddbde54a20ec2cca04ce
  Author: Cătălin Frâncu <cata at francu.com>
  Date:   2014-08-06 (Wed, 06 Aug 2014)

  Changed paths:
    A templates/admin/bulkLabel.ihtml
    A templates/admin/bulkLabelSelectSuffix.ihtml
    A templates/admin/cloneModel.ihtml
    A templates/admin/deleteModel.ihtml
    A templates/admin/editModel.ihtml
    M templates/admin/index.ihtml
    A templates/admin/mergeLexems.ihtml
    A templates/admin/placeAccents.ihtml
    A templates/admin/viewLexemsWithComments.ihtml
    M templates/common/bits/lexemModel.ihtml
    R templates/flex/bulkLabel.ihtml
    R templates/flex/bulkLabelSelectSuffix.ihtml
    R templates/flex/cloneModel.ihtml
    R templates/flex/deleteModel.ihtml
    R templates/flex/editModel.ihtml
    R templates/flex/mergeLexems.ihtml
    R templates/flex/placeAccents.ihtml
    R templates/flex/viewLexemsWithComments.ihtml
    A wwwbase/admin/bulkLabel.php
    A wwwbase/admin/bulkLabelSelectSuffix.php
    A wwwbase/admin/cloneModel.php
    A wwwbase/admin/deleteModel.php
    A wwwbase/admin/dispatchModelAction.php
    A wwwbase/admin/editModel.php
    M wwwbase/admin/index.php
    A wwwbase/admin/mergeLexems.php
    A wwwbase/admin/placeAccents.php
    A wwwbase/admin/viewAmbiguousLexems.php
    A wwwbase/admin/viewLexemsByModel.php
    A wwwbase/admin/viewLexemsWithComments.php
    A wwwbase/admin/viewLexemsWithoutAccents.php
    A wwwbase/admin/viewTemporaryLexems.php
    R wwwbase/flex/bulkLabel.php
    R wwwbase/flex/bulkLabelSelectSuffix.php
    R wwwbase/flex/cloneModel.php
    R wwwbase/flex/deleteModel.php
    R wwwbase/flex/dispatchModelAction.php
    R wwwbase/flex/editModel.php
    R wwwbase/flex/mergeLexems.php
    R wwwbase/flex/placeAccents.php
    R wwwbase/flex/viewAmbiguousLexems.php
    R wwwbase/flex/viewLexemsByModel.php
    R wwwbase/flex/viewLexemsWithComments.php
    R wwwbase/flex/viewLexemsWithoutAccents.php
    R wwwbase/flex/viewTemporaryLexems.php

  Log Message:
  -----------
  Merge the admin/ and flex/ directories (under wwwbase/ and under templates/).