Doing a resync from mainline 8633:10895. There was one simple to resolve conflict...

[rails.git] / public / potlatch / potlatch.swf

diff --git a/public/potlatch/potlatch.swf b/public/potlatch/potlatch.swf
index 1f7becb4888e08564b6771f5780537db1e300111..33649c88a84df372aa0d21021259ba86114b0d50 100755 (executable)
Binary files a/public/potlatch/potlatch.swf and b/public/potlatch/potlatch.swf differ