Skip to content

Commit 7d30ca7

Browse files
Merge branch 'berlinphp:master' into master
2 parents c118509 + 3b37fec commit 7d30ca7

3 files changed

Lines changed: 67 additions & 4 deletions

File tree

Gemfile.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -217,23 +217,23 @@ GEM
217217
rb-inotify (~> 0.9, >= 0.9.7)
218218
ruby_dep (~> 1.2)
219219
mercenary (0.3.6)
220-
mini_portile2 (2.6.1)
220+
mini_portile2 (2.8.0)
221221
minima (2.4.1)
222222
jekyll (~> 3.5)
223223
jekyll-feed (~> 0.9)
224224
jekyll-seo-tag (~> 2.1)
225225
minitest (5.11.3)
226226
multipart-post (2.1.1)
227-
nokogiri (1.12.5)
228-
mini_portile2 (~> 2.6.1)
227+
nokogiri (1.13.6)
228+
mini_portile2 (~> 2.8.0)
229229
racc (~> 1.4)
230230
octokit (4.21.0)
231231
faraday (>= 0.9)
232232
sawyer (~> 0.8.0, >= 0.5.3)
233233
pathutil (0.16.2)
234234
forwardable-extended (~> 2.6)
235235
public_suffix (2.0.5)
236-
racc (1.5.2)
236+
racc (1.6.0)
237237
rb-fsevent (0.11.0)
238238
rb-inotify (0.10.1)
239239
ffi (~> 1.0)

_posts/2022-05-03-may.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ title: Meetup on the 3rd of May, 2022
44
datetitle: May 3rd, 2022
55
published: true
66
meetupdate: 2022-05-03
7+
cancelled: NO TALKS :-(
78
---
89

910
<div class="slot span4"><div class="icon-awesome"><i class="icon-comment-alt"></i></div>

_posts/2022-06-07-june.md

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
---
2+
layout: post-slots
3+
title: Meetup on the 7th of June, 2022
4+
datetitle: June 7th, 2022
5+
published: true
6+
meetupdate: 2022-06-07
7+
---
8+
9+
<div class="slot span4"><div class="icon-awesome"><i class="icon-comment-alt"></i></div>
10+
11+
{% comment %} ==== TALK / PRESENTATION - SLOT #1 ==== {% endcomment %}
12+
13+
{% comment %} TITLE OF YOUR TALK: {% endcomment %}
14+
<h4>MySQL for E-Commerce</h4>
15+
16+
{% comment %} SUB-TITLE OR DESCRIPTION: {% endcomment %}
17+
<p>Advanced topics for MySQL: schema design, indexes, locking, replica usage,
18+
queues, logs, data migration, anonymization, legacy data, server configuration,
19+
etc.
20+
</p>
21+
22+
{% comment %} UNCOMMENT/EDIT NEXT LINE: {% endcomment %}
23+
<p><a class="speaker" target="_blank" href="https://twitter.com/thbley">Thomas Bley</a></p>
24+
25+
</div>
26+
27+
<div class="slot span4"><div class="icon-awesome"><i class="icon-comment-alt"></i></div>
28+
29+
{% comment %} ==== TALK / PRESENTATION - SLOT #2 ==== {% endcomment %}
30+
31+
{% comment %} TITLE OF YOUR TALK: {% endcomment %}
32+
<h4>Free Slot</h4>
33+
34+
{% comment %} SUB-TITLE OR DESCRIPTION: {% endcomment %}
35+
<p>This 25 minute slot could be yours!</p>
36+
37+
{% comment %} REMOVE NEXT LINE: {% endcomment %}
38+
<p><a class="speaker" target="_blank" href="/submit.html"><strong>Submit your talk now</strong></a></p>
39+
40+
{% comment %} UNCOMMENT/EDIT NEXT LINE: {% endcomment %}
41+
<!-- <p><a class="speaker" target="_blank" href="https://twitter.com/...HOW-TO-CONTACT-YOU">YOUR NAME</a></p> -->
42+
43+
</div>
44+
45+
<div class="slot span4"><div class="icon-awesome"><i class="icon-comment-alt"></i></div>
46+
47+
{% comment %} ==== TALK / PRESENTATION - SLOT #3 ==== {% endcomment %}
48+
49+
{% comment %} TITLE OF YOUR TALK: {% endcomment %}
50+
<h4>Free Slot</h4>
51+
52+
{% comment %} SUB-TITLE OR DESCRIPTION: {% endcomment %}
53+
<p>This 25 minute slot could be yours!</p>
54+
55+
{% comment %} REMOVE NEXT LINE: {% endcomment %}
56+
<p><a class="speaker" target="_blank" href="/submit.html"><strong>Submit your talk now</strong></a></p>
57+
58+
{% comment %} UNCOMMENT/EDIT NEXT LINE: {% endcomment %}
59+
<!-- <p><a class="speaker" target="_blank" href="https://twitter.com/...HOW-TO-CONTACT-YOU">YOUR NAME</a></p> -->
60+
61+
</div>
62+

0 commit comments

Comments
 (0)