Merge branch 'prosilverhistory'

Browse Source

versuch live und prosilver 3.2.1 zu mergen, teilweise erfolgreich

...

This commit is contained in:

eggy

2017-07-18 18:03:33 +02:00

parent 0047785fb8 cffae19823

commit 4036efb9d6

105 changed files with 210 additions and 202 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

theme/images/announce_read.gif

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 728 B After Width:  |  Height:  |  Size: 2.6 KiB

BIN

theme/images/announce_read_1.gif Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.6 KiB

BIN

theme/images/announce_read_locked.gif

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 738 B After Width:  |  Height:  |  Size: 2.7 KiB

BIN

theme/images/announce_read_locked_1.gif Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.7 KiB

BIN

theme/images/announce_read_locked_mine.gif

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 753 B After Width:  |  Height:  |  Size: 2.1 KiB

BIN

theme/images/announce_read_locked_mine_1.gif Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.1 KiB

BIN

theme/images/announce_read_mine.gif

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 724 B After Width:  |  Height:  |  Size: 2.1 KiB

BIN

theme/images/announce_read_mine_1.gif Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.1 KiB

BIN

theme/images/announce_unread.gif

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 730 B After Width:  |  Height:  |  Size: 2.6 KiB

BIN

theme/images/announce_unread_1.gif Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.6 KiB

BIN

theme/images/announce_unread_locked.gif

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 745 B After Width:  |  Height:  |  Size: 2.7 KiB

BIN

theme/images/announce_unread_locked_1.gif Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.7 KiB

BIN

theme/images/announce_unread_locked_mine.gif

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 755 B After Width:  |  Height:  |  Size: 2.2 KiB

BIN

theme/images/announce_unread_locked_mine_1.gif Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.2 KiB

BIN

theme/images/announce_unread_mine.gif

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 765 B After Width:  |  Height:  |  Size: 2.2 KiB

BIN

theme/images/announce_unread_mine_1.gif Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.2 KiB

BIN

theme/images/forum_link.gif

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 319 B After Width:  |  Height:  |  Size: 2.5 KiB

BIN

theme/images/forum_link_1.gif Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.5 KiB

BIN

theme/images/forum_read.gif

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.3 KiB After Width:  |  Height:  |  Size: 2.1 KiB

BIN

theme/images/forum_read_1.gif Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.1 KiB

BIN

theme/images/forum_read_locked.gif

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.5 KiB After Width:  |  Height:  |  Size: 2.6 KiB

BIN

theme/images/forum_read_locked_1.gif Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.6 KiB

BIN

theme/images/forum_read_subforum.gif

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.3 KiB After Width:  |  Height:  |  Size: 2.8 KiB

BIN

theme/images/forum_read_subforum_1.gif Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.8 KiB

BIN

theme/images/forum_unread.gif

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 296 B After Width:  |  Height:  |  Size: 2.1 KiB

BIN

theme/images/forum_unread_1.gif Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.1 KiB

BIN

theme/images/forum_unread_locked.gif

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 411 B After Width:  |  Height:  |  Size: 2.6 KiB

BIN

theme/images/forum_unread_locked_1.gif Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.6 KiB

BIN

theme/images/forum_unread_subforum.gif

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 303 B After Width:  |  Height:  |  Size: 2.8 KiB

BIN

theme/images/forum_unread_subforum_1.gif Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.8 KiB

BIN

theme/images/sticky_read.gif

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 625 B After Width:  |  Height:  |  Size: 2.5 KiB

BIN

theme/images/sticky_read_1.gif Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.5 KiB

BIN

theme/images/sticky_read_locked.gif

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 646 B After Width:  |  Height:  |  Size: 1.9 KiB

BIN

theme/images/sticky_read_locked_1.gif Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.9 KiB

BIN

theme/images/sticky_read_locked_mine.gif

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 662 B After Width:  |  Height:  |  Size: 2.0 KiB

BIN

theme/images/sticky_read_locked_mine_1.gif Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.0 KiB

BIN

theme/images/sticky_read_mine.gif

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 633 B After Width:  |  Height:  |  Size: 2.0 KiB

BIN

theme/images/sticky_read_mine_1.gif Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.0 KiB

BIN

theme/images/sticky_unread.gif

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 622 B After Width:  |  Height:  |  Size: 2.5 KiB

BIN

theme/images/sticky_unread_1.gif Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.5 KiB

BIN

theme/images/sticky_unread_locked.gif

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 626 B After Width:  |  Height:  |  Size: 2.0 KiB

BIN

theme/images/sticky_unread_locked_1.gif Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.0 KiB

BIN

theme/images/sticky_unread_locked_mine.gif

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 682 B After Width:  |  Height:  |  Size: 2.0 KiB

BIN

theme/images/sticky_unread_locked_mine_1.gif Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.0 KiB

BIN

theme/images/sticky_unread_mine.gif

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 643 B After Width:  |  Height:  |  Size: 2.0 KiB

BIN

theme/images/sticky_unread_mine_1.gif Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.0 KiB

BIN

theme/images/topic_moved.gif

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 693 B After Width:  |  Height:  |  Size: 2.5 KiB

BIN

theme/images/topic_moved_1.gif Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.5 KiB

BIN

theme/images/topic_read.gif

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 679 B After Width:  |  Height:  |  Size: 2.1 KiB

BIN

theme/images/topic_read_1.gif Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.1 KiB

BIN

theme/images/topic_read_hot.gif

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.4 KiB After Width:  |  Height:  |  Size: 2.6 KiB

BIN

theme/images/topic_read_hot_1.gif Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.6 KiB

BIN

theme/images/topic_read_hot_mine.gif

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.5 KiB After Width:  |  Height:  |  Size: 2.2 KiB

BIN

theme/images/topic_read_hot_mine_1.gif Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.2 KiB

BIN

theme/images/topic_read_locked.gif

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 748 B After Width:  |  Height:  |  Size: 2.5 KiB

BIN

theme/images/topic_read_locked_1.gif Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.5 KiB

BIN

theme/images/topic_read_locked_mine.gif

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 749 B After Width:  |  Height:  |  Size: 2.6 KiB

BIN

theme/images/topic_read_locked_mine_1.gif Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.6 KiB

BIN

theme/images/topic_read_mine.gif

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 695 B After Width:  |  Height:  |  Size: 2.6 KiB

BIN

theme/images/topic_read_mine_1.gif Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.6 KiB

BIN

theme/images/topic_unread.gif

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 678 B After Width:  |  Height:  |  Size: 2.5 KiB

BIN

theme/images/topic_unread_1.gif Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.5 KiB

BIN

theme/images/topic_unread_hot.gif

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.4 KiB After Width:  |  Height:  |  Size: 2.6 KiB

BIN

theme/images/topic_unread_hot_1.gif Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.6 KiB

BIN

theme/images/topic_unread_hot_mine.gif

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.3 KiB After Width:  |  Height:  |  Size: 2.1 KiB

BIN

theme/images/topic_unread_hot_mine_1.gif Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.1 KiB

BIN

theme/images/topic_unread_locked.gif

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 745 B After Width:  |  Height:  |  Size: 2.5 KiB

BIN

theme/images/topic_unread_locked_1.gif Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.5 KiB

BIN

theme/images/topic_unread_locked_mine.gif

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 764 B After Width:  |  Height:  |  Size: 2.6 KiB

BIN

theme/images/topic_unread_locked_mine_1.gif Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.6 KiB

BIN

theme/images/topic_unread_mine.gif

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 704 B After Width:  |  Height:  |  Size: 2.6 KiB

BIN

theme/images/topic_unread_mine_1.gif Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.6 KiB