1. 08 Sep, 2017 1 commit
  2. 25 Mar, 2017 1 commit
    • jonnybradley's avatar
      [MRG] Automatic merge, trunk 61745 to 61845 · 46b24d4c
      jonnybradley authored
      Conflicts fixed (with tf) on:
              admin/include_general.php
              admin/include_intertiki.php
              db/config/controllers.xml
              lib/core/Search/Indexer.php
              lib/core/Services/Edit/PluginController.php
              lib/core/Tiki/MemoryLimit.php
              lib/prefs/wikiplugin.php
              templates/admin/include_calendar.tpl
              templates/admin/include_print.tpl
      Setup and composer update to follow...
      46b24d4c
  3. 24 Mar, 2017 1 commit
  4. 01 Jun, 2016 1 commit
  5. 02 Feb, 2016 1 commit
  6. 01 Dec, 2015 1 commit
  7. 30 Nov, 2015 2 commits
  8. 18 Sep, 2015 1 commit
  9. 27 Aug, 2015 1 commit
  10. 20 Mar, 2015 1 commit
  11. 21 Nov, 2014 1 commit
  12. 29 Jul, 2014 1 commit
  13. 28 Jul, 2014 1 commit
  14. 08 Apr, 2014 1 commit
  15. 21 Nov, 2013 2 commits
  16. 22 Oct, 2013 1 commit
  17. 16 Sep, 2013 1 commit
  18. 02 Jul, 2013 1 commit
  19. 16 Mar, 2013 1 commit
  20. 01 Mar, 2013 2 commits
  21. 28 Feb, 2013 1 commit
  22. 06 Nov, 2012 1 commit
  23. 03 Oct, 2012 1 commit
  24. 06 Jun, 2012 1 commit
  25. 24 May, 2012 1 commit
  26. 16 Mar, 2012 2 commits
  27. 16 Jan, 2012 1 commit
  28. 09 Sep, 2011 1 commit
  29. 30 Aug, 2011 1 commit
  30. 29 Aug, 2011 1 commit
  31. 17 Aug, 2011 1 commit
  32. 09 May, 2011 1 commit
  33. 14 Apr, 2011 1 commit
  34. 17 Mar, 2011 1 commit
  35. 03 Mar, 2011 1 commit
  36. 27 Feb, 2011 1 commit