Author: Jonathan.Wage
Date: 2010-02-23 20:15:06 +0100 (Tue, 23 Feb 2010)
New Revision: 28224
Added:
plugins/sfSympalPlugin/trunk/test.txt
plugins/sfSympalPlugin/trunk/web/test.txt
Modified:
plugins/sfSympalPlugin/trunk/README
Log:
Merge branch 'master' into svn
Conflicts:
README
Modified: plugins/sfSympalPlugin/trunk/README
===================================================================
--- plugins/sfSympalPlugin/trunk/README 2010-02-23 18:39:30 UTC (rev 28223)
+++ plugins/sfSympalPlugin/trunk/README 2010-02-23 19:15:06 UTC (rev 28224)
@@ -1 +1,3 @@
-All documentation and information about Sympal can be found on the website at
[http://www.sympalphp.org](http://www.sympalphp.org).
\ No newline at end of file
+# Sympal
+
+All documentation and information about Sympal can be found on the website at
[http://www.sympalphp.org](http://www.sympalphp.org).
Added: plugins/sfSympalPlugin/trunk/test.txt
===================================================================
--- plugins/sfSympalPlugin/trunk/test.txt (rev 0)
+++ plugins/sfSympalPlugin/trunk/test.txt 2010-02-23 19:15:06 UTC (rev
28224)
@@ -0,0 +1 @@
+Testing
\ No newline at end of file
Added: plugins/sfSympalPlugin/trunk/web/test.txt
===================================================================
--- plugins/sfSympalPlugin/trunk/web/test.txt (rev 0)
+++ plugins/sfSympalPlugin/trunk/web/test.txt 2010-02-23 19:15:06 UTC (rev
28224)
@@ -0,0 +1 @@
+Testing
\ No newline at end of file
--
You received this message because you are subscribed to the Google Groups
"symfony SVN" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/symfony-svn?hl=en.
