Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch '2.4-trunk' into 2.5-trunk

Conflicts:
	.gitignore
	CHANGES
	META.yml
	lib/RT/IR.pm
  • Loading branch information...
commit 11c9e63634ef00eccc393b11902c4e6720bf2ddf 2 parents 1b8fc04 + 44f7bf4
@ruz ruz authored
Showing with 3 additions and 4 deletions.
  1. +1 −0  .gitignore
  2. +1 −4 CHANGES
  3. +1 −0  MANIFEST.SKIP
View
1  .gitignore
@@ -3,4 +3,5 @@ Makefile.old
MANIFEST.bak
blib/
pm_to_blib
+t/tmp
*.swp
View
5 CHANGES
@@ -45,7 +45,7 @@ CALLBACKS
* 'AfterRequestors' in several components
* 'LeftColumnStart' and 'RightColumnStart' in Display.html
-CHANGES IN 2.4.6
+CHANGES IN 2.4.5
----------------
BUGS
@@ -54,9 +54,6 @@ BUGS
* respect per queue SubjectTag in templates. Read UPGRADING for
upgrade instructions.
-CHANGES IN 2.4.5
-----------------
-
CLEANUPS
========
View
1  MANIFEST.SKIP
@@ -7,3 +7,4 @@
\.bak$
^Makefile$
^\.git
+^t/tmp/
Please sign in to comment.
Something went wrong with that request. Please try again.