[dev] [dexonline/dexonline] dfe83d: Merge pull request #1 from dexonline/master

[GitHub via Dev]

  Branch: refs/heads/master
  Home:   https://github.com/dexonline/dexonline
  Commit: dfe83da73adfd0ea03ee8fa051ea2d85c3968554
      https://github.com/dexonline/dexonline/commit/dfe83da73adfd0ea03ee8fa051ea2d85c3968554
  Author: tonicava <tonicava at users.noreply.github.com>
  Date:   2016-09-26 (Mon, 26 Sep 2016)

  Changed paths:
    A patches/00182.sql
    M templates/admin/definitionEdit.tpl

  Log Message:
  -----------
  Merge pull request #1 from dexonline/master

Update fork


  Commit: 79acb63944d59ca95b40e3aaf078dd26c3c10e84
      https://github.com/dexonline/dexonline/commit/79acb63944d59ca95b40e3aaf078dd26c3c10e84
  Author: Octavian Mocanu <octavian.mocanu at letgo.com>
  Date:   2016-09-30 (Fri, 30 Sep 2016)

  Changed paths:
    M docs/abbrev/de.conf
    M docs/abbrev/mda.conf
    A patches/00183.sql

  Log Message:
  -----------
  [#420] umplere tabela abrevieri


  Commit: dc2aec71eb612a995a7649041fd784e4b196ead1
      https://github.com/dexonline/dexonline/commit/dc2aec71eb612a995a7649041fd784e4b196ead1
  Author: tonicava <tonicava at users.noreply.github.com>
  Date:   2016-10-02 (Sun, 02 Oct 2016)

  Changed paths:
    M docs/abbrev/de.conf
    M docs/abbrev/mda.conf
    M phplib/models/Lexem.php
    M phplib/models/ModelDescription.php
    M templates/bits/lexem.tpl
    M wwwbase/admin/cloneModel.php

  Log Message:
  -----------
  Merge pull request #2 from dexonline/master

Update fork


  Commit: 59bf96f9e1e93012f3cc3e539ecf96e59c2716ae
      https://github.com/dexonline/dexonline/commit/59bf96f9e1e93012f3cc3e539ecf96e59c2716ae
  Author: Octavian Mocanu <octavian.mocanu at letgo.com>
  Date:   2016-09-30 (Fri, 30 Sep 2016)

  Changed paths:
    M docs/abbrev/de.conf
    M phplib/models/Lexem.php
    M phplib/models/ModelDescription.php
    M templates/bits/lexem.tpl
    M wwwbase/admin/cloneModel.php

  Log Message:
  -----------
  master merged into branch


  Commit: fddff2a8ea53ae8f4d233b2e392149d542da03c5
      https://github.com/dexonline/dexonline/commit/fddff2a8ea53ae8f4d233b2e392149d542da03c5
  Author: Cătălin Frâncu <cata at francu.com>
  Date:   2016-10-03 (Mon, 03 Oct 2016)

  Changed paths:
    A patches/00183.sql

  Log Message:
  -----------
  Merge pull request #516 from tonicava/420_umplere_tabela_abrevieri

420 umplere tabela abrevieri


Compare: https://github.com/dexonline/dexonline/compare/fe2ebee85a0d...fddff2a8ea53