[dev] [dexonline/dexonline] 5f0cc4: Add support for tree merges.

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/dexonline/dexonline
  Commit: 5f0cc4f058a4c226ebe1dcef28de115db4fc09a5
      https://github.com/dexonline/dexonline/commit/5f0cc4f058a4c226ebe1dcef28de115db4fc09a5
  Author: Cătălin Frâncu <cata at francu.com>
  Date:   2016-11-16 (Wed, 16 Nov 2016)

  Changed paths:
    M phplib/models/Association.php
    M phplib/models/Meaning.php
    M phplib/models/Mention.php
    M phplib/models/Tree.php
    M templates/editTree.tpl
    M wwwbase/admin/viewTreeMentions.php
    M wwwbase/editTree.php

  Log Message:
  -----------
  Add support for tree merges.