Merge branch 'master' into forum
authorAleksander Łukasz <aleksander.lukasz@nowoczesnapolska.org.pl>
Tue, 10 Sep 2013 13:34:08 +0000 (15:34 +0200)
committerAleksander Łukasz <aleksander.lukasz@nowoczesnapolska.org.pl>
Tue, 10 Sep 2013 13:34:08 +0000 (15:34 +0200)
commit3ab554e979a707490d303aaa690fde92c9c643c3
treefbe6d4478c5ed71d35cdf25a7a21a6eb2c32450f
parenta05cfe06961851a063744a1b0ac8b1d8854a9d74
parent81924fe71a34d654c68fe238ec4d43ca26ca0882
Merge branch 'master' into forum

Conflicts:
edumed/templates/home.html
edumed/templates/home.html