summaryrefslogtreecommitdiffstats
path: root/user_guide_src/source/images/smile.gif
diff options
context:
space:
mode:
authorEric Barnes <eric@ericlbarnes.com>2011-11-27 06:30:22 +0100
committerEric Barnes <eric@ericlbarnes.com>2011-11-27 06:30:22 +0100
commit7e66dda705743cbfe1d522ddb73e5694006ec42c (patch)
treec08b63deb28c09ec49d9173280f1ca234debfe50 /user_guide_src/source/images/smile.gif
parent7eceb03f083643254c7393c6b5ebe539e344a1ba (diff)
parente101593561a10632c1d63180436b19f1d7115046 (diff)
Merge branch 'refs/heads/develop' into feature/unit-tests
Conflicts: user_guide/helpers/number_helper.html
Diffstat (limited to 'user_guide_src/source/images/smile.gif')
-rw-r--r--user_guide_src/source/images/smile.gifbin0 -> 1156 bytes
1 files changed, 0 insertions, 0 deletions
diff --git a/user_guide_src/source/images/smile.gif b/user_guide_src/source/images/smile.gif
new file mode 100644
index 000000000..bf0922504
--- /dev/null
+++ b/user_guide_src/source/images/smile.gif
Binary files differ