diff options
| author | Alexander Sulfrian <alexander@sulfrian.net> | 2012-07-13 21:57:25 +0200 |
|---|---|---|
| committer | Alexander Sulfrian <alexander@sulfrian.net> | 2012-07-13 21:57:52 +0200 |
| commit | 5b0080abf61822c71fbcfaccaf5bac808f387ade (patch) | |
| tree | a3db5999e82bb7a9d8a6b3bae24a54989a71efe6 /utils | |
| parent | d019dea5c77f1a82d486d776b7fedc3294ddb3ff (diff) | |
| parent | b0010c195872c632e68471eef955b9851d90a956 (diff) | |
| download | www-5b0080abf61822c71fbcfaccaf5bac808f387ade.tar.gz www-5b0080abf61822c71fbcfaccaf5bac808f387ade.tar.bz2 www-5b0080abf61822c71fbcfaccaf5bac808f387ade.zip | |
Merge remote-tracking branch 'origin/master'
* origin/master:
tobib_services-hover.diff patch
added some dummy content for services
fixed typo, removed hover effect and added .pyc-files to gitignore
Conflicts:
index.html
static/css/main.css
static/css/reset.css
utils/filters.pyc
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/filters.pyc | bin | 817 -> 0 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/utils/filters.pyc b/utils/filters.pyc Binary files differdeleted file mode 100644 index 7996174..0000000 --- a/utils/filters.pyc +++ /dev/null |