[zanata/zanata-server] 4793c8: Implement plural support for zanata-spa

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/zanata/zanata-server
  Commit: 4793c88fd098947972d1ca9b855870251755ceab
      https://github.com/zanata/zanata-server/commit/4793c88fd098947972d1ca9b855870251755ceab
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-01-28 (Wed, 28 Jan 2015)

  Changed paths:
    M zanata-war/src/main/webapp/app/config.json
    M zanata-war/src/main/webapp/app/css/app.css
    M zanata-war/src/main/webapp/app/css/libs.css
    M zanata-war/src/main/webapp/app/index.html
    M zanata-war/src/main/webapp/app/js/app.js
    M zanata-war/src/main/webapp/app/js/libs.js
    M zanata-war/src/main/webapp/app/js/templates.js
    M zanata-war/src/main/webapp/app/maps/app.js.map
    M zanata-war/src/main/webapp/app/maps/libs.js.map
    M zanata-war/src/main/webapp/app/translations/de.json
    M zanata-war/src/main/webapp/app/translations/fr.json

  Log Message:
  -----------
  Implement plural support for zanata-spa

Squashed commit of the following:

commit 8eaf6a4f1bec90815ab461d7fa7bfdfa5a5a5d0d
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Jan 27 13:22:24 2015 +1000

    Implement plural support for zanata-spa: https://bugzilla.redhat.com/show_bug.cgi?id=1172437


  Commit: 3eae95f598ff57e13657b169621ab23de1c81e17
      https://github.com/zanata/zanata-server/commit/3eae95f598ff57e13657b169621ab23de1c81e17
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-01-28 (Wed, 28 Jan 2015)

  Changed paths:
    M zanata-war/src/main/webapp/app/config.json
    M zanata-war/src/main/webapp/app/css/app.css
    M zanata-war/src/main/webapp/app/css/libs.css
    M zanata-war/src/main/webapp/app/index.html
    M zanata-war/src/main/webapp/app/js/app.js
    M zanata-war/src/main/webapp/app/js/libs.js
    M zanata-war/src/main/webapp/app/js/templates.js
    M zanata-war/src/main/webapp/app/maps/app.js.map
    M zanata-war/src/main/webapp/app/maps/libs.js.map
    M zanata-war/src/main/webapp/app/translations/de.json
    M zanata-war/src/main/webapp/app/translations/fr.json

  Log Message:
  -----------
  Merge branch 'release' into integration/master


Compare: https://github.com/zanata/zanata-server/compare/880b79569ef2...3eae95f598ff